Python3 does not have a 'long' type

Resolves #48

Author: naemono

circle.yml

@@ -7,7 +7,7 @@ machine:
 
 dependencies:
   override:
-    - pip install -r requirements/prod.txt -r requirements/dev.txt
+    - pip install -r requirements/dev.txt
     - pip install tox-pyenv codecov coveralls twine
     - pyenv local 2.7.10 3.5.0
 

objectrocket/util.py

@@ -1,6 +1,8 @@
 """Utility code for the objectrocket package."""
 import functools
 import datetime
+import six
+import sys
 
 from six import create_bound_method
 
@@ -68,7 +70,7 @@ def sum_values(value1, value2):
     if value2 is None:
         return value1
 
-    number_types = (int, float, long, bool) # noqa
+    number_types = (float, bool) + six.integer_types  # noqa
 
     if isinstance(value1, number_types) and isinstance(value2, number_types):
         return int(value1 + value2)
@@ -81,7 +83,7 @@ def sum_values(value1, value2):
 
     if isinstance(value1, list):
         return list(set(value1 + value2))
-    elif isinstance(value1, str) or isinstance(value1, datetime.datetime) or isinstance(value1, unicode): # noqa
+    elif isinstance(value1, str) or isinstance(value1, datetime.datetime) or isinstance(value1, six.text_type):  # noqa
         return value1
     elif isinstance(value1, dict):
         keys = set(value1.iterkeys()) | set(value2.iterkeys())

requirements/dev.txt

@@ -1,3 +1,4 @@
+-r prod.txt
 Sphinx>=1.2.2
 flake8>=2.1.0
 mock>=1.0.1

tox.ini

@@ -5,8 +5,7 @@ skipsdist = True
 
 [testenv]
 commands = {envbindir}/py.test {posargs} {toxinidir}/tests
-deps = -r{toxinidir}/requirements/prod.txt
-       -r{toxinidir}/requirements/dev.txt
+deps = -r{toxinidir}/requirements/dev.txt
 passenv = PYPI_USERNAME PYPI_PASSWORD
 recreate = False