Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dependency on future #9

Merged
merged 1 commit into from
Oct 30, 2023
Merged

Remove dependency on future #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ravenpackapi/models/results.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
requests[security]
future
six
python-dateutil
retry
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
)
1 change: 0 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ toxworkdir = {homedir}/.tox/ravenpackapi
deps =
pytest
pytest-xdist
future
python-dateutil
requests
commands = pytest -n 4
Expand Down