Merge branch 'schuyler-glympse-master'

Author: cwacek

python_jsonschema_objects/classbuilder.py

@@ -36,6 +36,7 @@ class ProtocolBase(collections.MutableMapping):
     """
     __propinfo__ = {}
     __required__ = set()
+    __object_attr_list__ = set(["_properties", "_extended_properties"])
 
     def as_dict(self):
         """ Return a dictionary containing the current values
@@ -164,7 +165,7 @@ def __init__(self, **props):
         #    self.validate()
 
     def __setattr__(self, name, val):
-        if name.startswith("_"):
+        if name in self.__object_attr_list__:
             object.__setattr__(self, name, val)
         elif name in self.__propinfo__:
             # If its in __propinfo__, then it actually has a property defined.

test/test_pytest.py

@@ -23,6 +23,37 @@ def test_regression_9():
     builder = pjs.ObjectBuilder(schema)
     builder.build_classes()
 
+
+def test_underscore_properties():
+    schema = {
+        "$schema": "http://json-schema.org/schema#",
+        "title": "AggregateQuery",
+        "type": "object",
+        "properties": {
+            "group": {
+                "type": "object",
+                "properties": {}
+            }
+        }
+    }
+
+    builder = pjs.ObjectBuilder(schema)
+    ns = builder.build_classes()
+    my_obj_type = ns.Aggregatequery
+    request_object = my_obj_type(
+        group={
+            "_id": {"foo_id": "$foo_id",
+                    "foo_type": "$foo_type"},
+            "foo": {"$sum": 1}, }
+    )
+
+    assert request_object.group._id == {
+        "foo_id": "$foo_id",
+        "foo_type": "$foo_type"
+    }
+
+
+
 def test_array_regressions():
     schema = {
         "$schema": "http://json-schema.org/schema#",
@@ -399,4 +430,4 @@ def test_strict_mode():
     with pytest.raises(pjs.ValidationError):
         ns = builder.build_classes(strict=True)
         NameData = ns.NameData
-        NameData(lastName="hello")
+        NameData(lastName="hello")