|
19 | 19 | from builtins import str |
20 | 20 |
|
21 | 21 | import requests |
22 | | -from future.moves.urllib.parse import parse_qs |
23 | | -from future.utils import iteritems |
| 22 | +from urllib.parse import parse_qs |
24 | 23 | from requests.adapters import HTTPAdapter |
25 | 24 | # Python 2/3 compatibility |
26 | 25 | from requests.compat import urljoin |
@@ -153,7 +152,7 @@ def __make_request(self, url, method=u'GET', headers=None, body_string=None, **k |
153 | 152 | # the problem with parse_qs is that it will return a list for ALL params, even if they are a single value |
154 | 153 | # we need to essentially flatten the params if a param has only one value |
155 | 154 | query = dict((k, v if len(v) > 1 else v[0]) |
156 | | - for k, v in iteritems(query)) |
| 155 | + for k, v in query.items()) |
157 | 156 |
|
158 | 157 | signed_headers, signed_body = self.__build_vinyldns_request(method, path, body_string, query, |
159 | 158 | with_headers=headers or {}, **kwargs) |
@@ -215,7 +214,7 @@ def canonical_header_name(field_name): |
215 | 214 | u'Date': now.strftime(u'%a, %d %b %Y %H:%M:%S GMT'), |
216 | 215 | u'X-Amz-Date': now.strftime(u'%Y%m%dT%H%M%SZ')} |
217 | 216 |
|
218 | | - for k, v in iteritems(new_headers): |
| 217 | + for k, v in new_headers.items(): |
219 | 218 | headers[canonical_header_name(k)] = v |
220 | 219 |
|
221 | 220 | for k in map(canonical_header_name, suppressed_keys): |
|
0 commit comments