Merge pull request #3 from dimagi/jsonobject-type-config

make changes to accomodate jsonobject type config changes

.travis.yml

@@ -3,9 +3,7 @@ language: python
 services:
     - couchdb
 
-python:
-    - 2.6
-    - 2.7
+python: 2.7
 
 install: 
     - pip install -r requirements_dev.txt --use-mirrors

couchdbkit/__init__.py

@@ -22,7 +22,7 @@
     Property, IntegerProperty, DecimalProperty, BooleanProperty, FloatProperty, StringProperty,
     DateTimeProperty, DateProperty, TimeProperty,
     dict_to_json, dict_to_json, dict_to_json,
-    value_to_python, dict_to_python,
+    dict_to_python,
     DocumentSchema, DocumentBase, Document, StaticDocument, contain,
     QueryMixin, AttachmentMixin,
     SchemaProperty, SchemaListProperty, SchemaDictProperty,

couchdbkit/ext/django/schema.py

@@ -34,15 +34,16 @@
             'DecimalProperty', 'BooleanProperty', 'FloatProperty',
             'DateTimeProperty', 'DateProperty', 'TimeProperty',
             'dict_to_json', 'list_to_json', 'value_to_json',
-            'value_to_python', 'dict_to_python', 'list_to_python',
+            'dict_to_python', 'list_to_python',
             'convert_property', 'DocumentSchema', 'Document',
             'SchemaProperty', 'SchemaListProperty', 'ListProperty',
             'DictProperty', 'StringDictProperty', 'StringListProperty',
             'SchemaDictProperty', 'SetProperty',]
 
 
 DEFAULT_NAMES = ('verbose_name', 'db_table', 'ordering',
-                 'app_label')
+                 'app_label', 'string_conversions', 'properties',
+                 'update_properties')
 
 class Options(object):
     """ class based on django.db.models.options. We only keep
@@ -180,7 +181,6 @@ def get_db(cls):
 dict_to_json = schema.dict_to_json
 list_to_json = schema.list_to_json
 value_to_json = schema.value_to_json
-value_to_python = schema.value_to_python
 dict_to_python = schema.dict_to_python
 list_to_python = schema.list_to_python
 convert_property = schema.convert_property

couchdbkit/schema/__init__.py

@@ -156,7 +156,6 @@ class A(Dcoument):
 threadsafe.
 """
 from .properties import (
-        ALLOWED_PROPERTY_TYPES,
         Property,
         StringProperty,
         IntegerProperty,
@@ -174,12 +173,9 @@ class A(Dcoument):
         dict_to_json,
         list_to_json,
         value_to_json,
-        MAP_TYPES_PROPERTIES,
-        value_to_python,
         dict_to_python,
         list_to_python,
         convert_property,
-        value_to_property,
         LazyDict,
         LazyList)
 

couchdbkit/schema/base.py

@@ -13,14 +13,14 @@
 from couchdbkit.utils import ProxyDict
 from ..exceptions import ResourceNotFound, ReservedWordError
 from . import properties as p
-from .properties import value_to_python, \
-convert_property, MAP_TYPES_PROPERTIES, ALLOWED_PROPERTY_TYPES, \
+from .properties import \
+convert_property, \
 LazyDict, LazyList
 from ..exceptions import DuplicatePropertyError, ResourceNotFound, \
 ReservedWordError
 
 
-__all__ = ['ReservedWordError', 'ALLOWED_PROPERTY_TYPES', 'DocumentSchema',
+__all__ = ['ReservedWordError', 'DocumentSchema',
         'SchemaProperties', 'DocumentBase', 'QueryMixin', 'AttachmentMixin',
         'Document', 'StaticDocument', 'valid_id']
 

couchdbkit/schema/properties.py

@@ -5,12 +5,6 @@
 import functools
 from jsonobject.properties import *
 from jsonobject.base import DefaultProperty
-from jsonobject.convert import (
-    ALLOWED_PROPERTY_TYPES,
-    MAP_TYPES_PROPERTIES,
-    value_to_python,
-    value_to_property
-)
 
 try:
     from collections import MutableSet, Iterable

setup.py

@@ -53,7 +53,7 @@
 
     install_requires = [
         'restkit>=4.2.2',
-        'jsonobject>=0.4.0',
+        'jsonobject>=0.6.0b1',
     ],
     provides=['couchdbkit'],
     obsoletes=['couchdbkit'],

tests/test_schema.py

@@ -44,7 +44,7 @@ class Test(Document):
         try:
             doc.bar="bla"
         except AttributeError, e:
-            self.assert_(str(e) == "bar is not defined in schema (not a valid property)")
+            self.assertEqual(str(e), "'bar' is not defined in schema (not a valid property)")
         doc.save()
         self.assert_(not hasattr(doc, "bar"))
         assert doc._doc['foo'] == "test"
@@ -59,7 +59,7 @@ class Test(StaticDocument):
         try:
             doc.bar="bla"
         except AttributeError, e:
-            self.assert_(str(e) == "bar is not defined in schema (not a valid property)")
+            self.assertEqual(str(e), "'bar' is not defined in schema (not a valid property)")
         doc.save()
         self.assert_(not hasattr(doc, "bar"))
         self.assert_(doc._doc['foo'] == "test")