fix: BaseObj.merge exception for AdditionalPropertiesContext

#51

The right way to check if a Context containing generated BaseObj is by
calling “is_produced” of Context, not by comparing None.

Author: mission-liao

pyswagger/scanner/v2_0/aggt.py

@@ -26,7 +26,6 @@ def _compose(obj, guard=None):
         _compose(v, guard)
 
     final = Schema(NullContext())
-    final.update_field('additionalProperties', obj.additionalProperties)
     final.merge(obj, SchemaContext)
 
     # those 'allOf' are visited by the last CycleGuard,

pyswagger/spec/v2_0/parser.py

@@ -83,7 +83,7 @@ def is_produced(kls, obj):
     def produce(self):
         """
         """
-        if self._obj != None:
+        if self.is_produced(self._obj):
             return self._obj
         else:
             return AdditionalPropertiesContext._TmpObj(self)