summaryrefslogtreecommitdiff
path: root/testing/tests/couch/test_atomicity.py
diff options
context:
space:
mode:
Diffstat (limited to 'testing/tests/couch/test_atomicity.py')
-rw-r--r--testing/tests/couch/test_atomicity.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/testing/tests/couch/test_atomicity.py b/testing/tests/couch/test_atomicity.py
index a3ae0314..48e1c01d 100644
--- a/testing/tests/couch/test_atomicity.py
+++ b/testing/tests/couch/test_atomicity.py
@@ -21,7 +21,7 @@ import os
import pytest
import threading
-from urlparse import urljoin
+from six.moves.urllib.parse import urljoin
from twisted.internet import defer
from uuid import uuid4