diff --git a/deepdiff/deepdiff.py b/deepdiff/deepdiff.py index a3353220..38ccfe74 100644 --- a/deepdiff/deepdiff.py +++ b/deepdiff/deepdiff.py @@ -4,7 +4,10 @@ import difflib import datetime +from builtins import int from collections import Iterable +from past.builtins import basestring +from six import iteritems class DeepDiff(object): r""" @@ -142,7 +145,7 @@ def __init__(self, t1, t2): self.diffit(t1, t2) - self.changes = dict((k, v) for k, v in self.changes.iteritems() if v) + self.changes = dict((k, v) for k, v in iteritems(self.changes) if v) # @property @@ -188,7 +191,7 @@ def diffit(self, t1, t2, parent="root"): diff = '\n'.join(diff) self.changes["values_changed"].append("%s:\n%s" % (parent, diff)) - elif isinstance(t1, (int, long, float, complex, datetime.datetime)): + elif isinstance(t1, (int, float, complex, datetime.datetime)): if t1 != t2: self.changes["values_changed"].append("%s: %s ====>> %s" % (parent, t1, t2)) diff --git a/setup.py b/setup.py index 8042d996..3df67b13 100644 --- a/setup.py +++ b/setup.py @@ -15,6 +15,7 @@ author_email='sep@zepworks.com', license='MIT', packages=['deepdiff'], + install_requires=['future', 'six'], zip_safe=False, long_description=long_description, classifiers=[