fix bugs

pyopenapi · Nov 29, 2014 · e3ab822 · e3ab822
1 parent b9af3bd
commit e3ab822
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pyswagger/base.py b/pyswagger/base.py
@@ -235,11 +235,12 @@ def resolve(self, ts):
         return obj
 
     def merge(self, other):
-        """ merge properties from other object
+        """ merge properties from other object,
+        only merge from 'not None' to 'None'.
         """
         for name, _ in self.__swagger_fields__:
             v = getattr(other, name)
-            if v and getattr(self, name) == None:
+            if v != None and getattr(self, name) == None:
                 if isinstance(v, weakref.ProxyTypes):
                     # TODO: test case
                     self.update_field(name, v)

diff --git a/pyswagger/tests/test_base.py b/pyswagger/tests/test_base.py
@@ -101,10 +101,11 @@ def test_merge(self):
 
         self.assertTrue(len(o2.a), 1)
         self.assertEqual(o2.d, None)
+        self.assertEqual(o2.f, None)
 
         o2.merge(o1)
         self.assertTrue(len(o2.a), 1)
-        self.assertEqaul(o2.f, '')
+        self.assertEqual(o2.f, '')
         self.assertTrue(isinstance(o2.d, ChildObj))
         self.assertTrue(isinstance(o2.d, weakref.ProxyTypes))