diff options
Diffstat (limited to 'common/src/leap/soledad/common/couch')
| -rw-r--r-- | common/src/leap/soledad/common/couch/__init__.py | 5 | ||||
| -rw-r--r-- | common/src/leap/soledad/common/couch/state.py | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/src/leap/soledad/common/couch/__init__.py b/common/src/leap/soledad/common/couch/__init__.py index 2e6f734e..2343e849 100644 --- a/common/src/leap/soledad/common/couch/__init__.py +++ b/common/src/leap/soledad/common/couch/__init__.py @@ -25,9 +25,8 @@ import re import uuid import binascii - -from StringIO import StringIO -from urlparse import urljoin +from six import StringIO +from six.moves.urllib.parse import urljoin from contextlib import contextmanager diff --git a/common/src/leap/soledad/common/couch/state.py b/common/src/leap/soledad/common/couch/state.py index a4841d0d..8cbe0934 100644 --- a/common/src/leap/soledad/common/couch/state.py +++ b/common/src/leap/soledad/common/couch/state.py @@ -19,7 +19,8 @@ Server state using CouchDatabase as backend. """ import couchdb import re -from urlparse import urljoin + +from six.moves.urllib.parse import urljoin from leap.soledad.common.log import getLogger from leap.soledad.common.couch import CouchDatabase |