Skip to content

Commit

Permalink
fix(indexclient): py3 compat
Browse files Browse the repository at this point in the history
  • Loading branch information
philloooo committed Feb 27, 2018
1 parent 6789f3d commit 7232bf8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions indexclient/client.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import json
from urlparse import urljoin
try:
from urlparse import urljoin
except ImportError:
from urllib.parse import urljoin

import requests

Expand Down Expand Up @@ -205,7 +208,7 @@ def _load(self, json=None):
self._check_deleted()
json = json or self.client._get("index", self.did).json()
# set attributes to current Document
for k,v in json.iteritems():
for k,v in json.items():
self.__dict__[k] = v
self._attrs = json.keys()
self._fetched = True
Expand Down
2 changes: 1 addition & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pytest==3.0.6
-e git+https://github.com/uc-cdis/cdisutils-test.git@feat/indexd#egg=cdisutilstest
-e git+https://github.com/uc-cdis/cdisutils-test.git@0.2.0#egg=cdisutilstest
-e git+https://github.com/uc-cdis/[email protected]#egg=cdispyutils
-e git+https://github.com/uc-cdis/[email protected]#egg=indexd

0 comments on commit 7232bf8

Please sign in to comment.