Merge branch 'hotfix/0.0.22-1'

cwacek · cwacek · commit 35cdc2e1e6e1 · 2016-05-09T10:04:02.000-04:00
diff --git a/python_jsonschema_objects/classbuilder.py b/python_jsonschema_objects/classbuilder.py
@@ -39,7 +39,7 @@ class ProtocolBase(collections.MutableMapping):
         'boolean': bool,
         'integer': int,
         'number': (float, int, long),
-        'null': None,
+        'null': type(None),
         'string': six.string_types,
         'object': dict
     }

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class ProtocolBase(collections.MutableMapping):`
`39`	`39`	`'boolean': bool,`
`40`	`40`	`'integer': int,`
`41`	`41`	`'number': (float, int, long),`
`42`		`- 'null': None,`
	`42`	`+ 'null': type(None),`
`43`	`43`	`'string': six.string_types,`
`44`	`44`	`'object': dict`
`45`	`45`	`}`