diff --git a/networking_bgpvpn/neutron/services/common/utils.py b/networking_bgpvpn/neutron/services/common/utils.py index 8f92e517..61c0a2db 100644 --- a/networking_bgpvpn/neutron/services/common/utils.py +++ b/networking_bgpvpn/neutron/services/common/utils.py @@ -13,8 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import six - def rtrd_list2str(list): """Format Route Target list to string""" @@ -41,7 +39,7 @@ def rtrd_str2list(str): def filter_resource(resource, filters=None): if not filters: filters = {} - for key, value in six.iteritems(filters): + for key, value in filters.items(): if key in resource.keys(): if isinstance(value, list): if resource[key] not in value: diff --git a/networking_bgpvpn/neutron/services/service_drivers/opencontrail/opencontrail_client.py b/networking_bgpvpn/neutron/services/service_drivers/opencontrail/opencontrail_client.py index b1bc2bc4..ad24e983 100644 --- a/networking_bgpvpn/neutron/services/service_drivers/opencontrail/opencontrail_client.py +++ b/networking_bgpvpn/neutron/services/service_drivers/opencontrail/opencontrail_client.py @@ -20,7 +20,6 @@ from oslo_config import cfg from oslo_log import log from oslo_utils import uuidutils import requests -import six from six.moves import http_client as httplib from six.moves.urllib import parse as urlparse @@ -190,7 +189,7 @@ class RequestHandler(object): curl_command.append('"%s" ' % url) - for name, value in six.iteritems(req_params['headers']): + for name, value in req_params['headers'].items(): curl_command.append('-H "%s: %s" ' % (name, value)) if ('data' in req_params.keys() @@ -207,7 +206,7 @@ class RequestHandler(object): resp.status_code, resp.reason)] dump.extend('%s: %s\n' % (k, v) - for k, v in six.iteritems(resp.headers)) + for k, v in (resp.headers).items()) dump.append('\n') if resp.content: dump.extend([resp.content, '\n'])