diff --git a/ravenpackapi/models/results.py b/ravenpackapi/models/results.py index 621e28c..e3ad18c 100644 --- a/ravenpackapi/models/results.py +++ b/ravenpackapi/models/results.py @@ -1,7 +1,7 @@ import json from collections import OrderedDict -from past.builtins import basestring +from six import string_types, binary_type from ravenpackapi.models.fields import ANALYTICS_FIELDS_SET, FIELD_MAP, ANALYTICS_FIELDS @@ -32,7 +32,7 @@ def __len__(self): class Result(object): def __init__(self, record): - if isinstance(record, basestring): + if isinstance(record, string_types) or isinstance(record, binary_type): self.data = json.loads(record) else: self.data = record diff --git a/requirements.txt b/requirements.txt index 9e2de10..8a36d9f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ requests[security] -future six python-dateutil retry diff --git a/setup.py b/setup.py index d740df9..6aa29e3 100644 --- a/setup.py +++ b/setup.py @@ -35,5 +35,5 @@ ], keywords='python analytics api rest news data', - install_requires=['requests[security]', 'future', 'python-dateutil', 'six', 'retry'], + install_requires=['requests[security]', 'python-dateutil', 'six', 'retry'], ) diff --git a/tox.ini b/tox.ini index 39a59fc..492d9c3 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,6 @@ toxworkdir = {homedir}/.tox/ravenpackapi deps = pytest pytest-xdist - future python-dateutil requests commands = pytest -n 4