six.moves.urllib.parse

octodns/provider/fastdns.py

@@ -7,7 +7,7 @@ from __future__ import absolute_import, division, print_function, \
 
 from requests import Session
 from akamai.edgegrid import EdgeGridAuth
-from urlparse import urljoin
+from six.moves.urllib.parse import urljoin
 from collections import defaultdict
 
 from logging import getLogger

tests/test_octodns_provider_rackspace.py

@@ -8,11 +8,8 @@ from __future__ import absolute_import, division, print_function, \
 import json
 import re
 from six import text_type
+from six.moves.urllib.parse import urlparse
 from unittest import TestCase
-try:
-    from urlparse import urlparse
-except ImportError:
-    from urllib.parse import urlparse
 
 from requests import HTTPError
 from requests_mock import ANY, mock as requests_mock