mirror/github-octodns
1
0
Fork 0
mirror of https://github.com/github/octodns.git synced 2024-05-11 05:55:00 +00:00
Code Issues Releases Activity

six.moves.urllib.parse

Browse Source
This commit is contained in:
Ross McFarland
2019-10-05 08:47:12 -07:00
parent 470dd82202
commit 742305c20b
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
octodns/provider/fastdns.py
View File

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

5
tests/test_octodns_provider_rackspace.py
View File

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