Merge branch 'master' into dont_modify_schema

Author: zrq495

swagger_py_codegen/__init__.py

@@ -1,3 +1,3 @@
 from .command import generate
 
-__version__ = '0.1.18'
+__version__ = '0.1.19'

swagger_py_codegen/jsonschema.py

@@ -150,6 +150,20 @@ def keys(self):
                 return self.data.keys()
             return vars(self.data).keys()
 
+        def get_check(self, key, default=None):
+            if isinstance(self.data, dict):
+                value = self.data.get(key, default)
+                has_key = key in self.data
+            else:
+                try:
+                    value = getattr(self.data, key)
+                except AttributeError:
+                    value = default
+                    has_key = False
+                else:
+                    has_key = True
+            return value, has_key
+
     def _normalize_dict(schema, data):
         result = {}
         if not isinstance(data, DataWrapper):
@@ -160,8 +174,8 @@ def _normalize_dict(schema, data):
             type_ = _schema.get('type', 'object')
 
             # get value
-            value = data.get(key)
-            if value is not None:
+            value, has_key = data.get_check(key)
+            if has_key:
                 result[key] = _normalize(_schema, value)
             elif 'default' in _schema:
                 result[key] = _schema['default']