Merge pull request #229 from dimagi/gh/drop-code-support-py2

Drop code supporting Python 2

jsonobject/__init__.py

@@ -1,24 +1,11 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-from .base import JsonObjectMeta
 from .containers import JsonArray
 from .properties import *
 from .api import JsonObject
-import six
 
-if six.PY3:
-    __all__ = [
-        'IntegerProperty', 'FloatProperty', 'DecimalProperty',
-        'StringProperty', 'BooleanProperty',
-        'DateProperty', 'DateTimeProperty', 'TimeProperty',
-        'ObjectProperty', 'ListProperty', 'DictProperty', 'SetProperty',
-        'JsonObject', 'JsonArray',
-    ]
-else:
-    __all__ = [
-        b'IntegerProperty', b'FloatProperty', b'DecimalProperty',
-        b'StringProperty', b'BooleanProperty',
-        b'DateProperty', b'DateTimeProperty', b'TimeProperty',
-        b'ObjectProperty', b'ListProperty', b'DictProperty', b'SetProperty',
-        b'JsonObject', b'JsonArray',
-    ]
+__all__ = [
+    'IntegerProperty', 'FloatProperty', 'DecimalProperty',
+    'StringProperty', 'BooleanProperty',
+    'DateProperty', 'DateTimeProperty', 'TimeProperty',
+    'ObjectProperty', 'ListProperty', 'DictProperty', 'SetProperty',
+    'JsonObject', 'JsonArray',
+]

jsonobject/api.pyx

@@ -1,11 +1,7 @@
-from __future__ import absolute_import
-
 import datetime
 import decimal
 import re
 
-import six
-
 from jsonobject.base import JsonObjectBase, _LimitedDictInterfaceMixin
 from . import properties
 from .containers import JsonArray, JsonDict, JsonSet
@@ -21,10 +17,6 @@ re_datetime = re.compile(
 )
 re_decimal = re.compile(r'^(\d+)\.(\d+)$')
 
-if six.PY3:
-    unicode = str
-    long = int
-
 
 class JsonObject(JsonObjectBase, _LimitedDictInterfaceMixin):
     def __getstate__(self):
@@ -40,10 +32,10 @@ class JsonObject(JsonObjectBase, _LimitedDictInterfaceMixin):
             datetime.date: properties.DateProperty,
             datetime.time: properties.TimeProperty,
             str: properties.StringProperty,
-            unicode: properties.StringProperty,
+            str: properties.StringProperty,
             bool: properties.BooleanProperty,
             int: properties.IntegerProperty,
-            long: properties.IntegerProperty,
+            int: properties.IntegerProperty,
             float: properties.FloatProperty,
             list: properties.ListProperty,
             dict: properties.DictProperty,

jsonobject/base.pyx

@@ -1,7 +1,5 @@
-from __future__ import absolute_import
 from collections import namedtuple, OrderedDict
 import copy
-import six
 import inspect
 from jsonobject.exceptions import (
     DeleteNotAllowed,
@@ -179,8 +177,7 @@ class _JsonObjectPrivateInstanceVariables(object):
         self.dynamic_properties = dynamic_properties or {}
 
 
-@six.add_metaclass(JsonObjectMeta)
-class JsonObjectBase(object):
+class JsonObjectBase(object, metaclass=JsonObjectMeta):
 
     _allow_dynamic_properties = True
     _validate_required_lazily = False