Merge branch 'feature/fix/34' into develop

Author: cwacek

MANIFEST.in

@@ -1,5 +1,16 @@
 include requirements.txt
-include README.md
 
 include versioneer.py
 include python_jsonschema_objects/_version.py
+
+include *.py
+include *.txt
+include LICENSE
+include tox.ini
+recursive-include docs *.md
+recursive-include docs *.py
+recursive-include docs *.rst
+recursive-include docs Makefile
+recursive-include test *.json
+recursive-include test *.py
+recursive-include python_jsonschema_objects/examples *.md

README.md

@@ -0,0 +1 @@
+python_jsonschema_objects/examples/README.md

README.md

@@ -5,3 +5,4 @@ pandoc
 sphinx
 sphinx-autobuild
 recommonmark
+pytest

development.txt

@@ -214,7 +214,11 @@ def __setitem__(self, key, val):
       return setattr(self,key, val)
 
     def __delitem__(self, key):
-      return delattr(self, key)
+        if key in self._extended_properties:
+            del self._extended_properties[key]
+            return
+
+        return delattr(self, key)
 
     def __getattr__(self, name):
       if name not in self._extended_properties: