summaryrefslogtreecommitdiff
path: root/common/src/leap/soledad/common/couch/state.py
diff options
context:
space:
mode:
Diffstat (limited to 'common/src/leap/soledad/common/couch/state.py')
-rw-r--r--common/src/leap/soledad/common/couch/state.py3
1 files changed, 2 insertions, 1 deletions
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