From 026bb068a542dda727066520c33c34e72af1c2d6 Mon Sep 17 00:00:00 2001
From: llg8212 <lilinguo@huawei.com>
Date: Sat, 15 Feb 2014 11:09:28 +0800
Subject: [PATCH] Remove dependent module py3kcompat

Module py3kcompat was removed from oslo-incubator, we can use
six directly.

* Sync commit of removing py3kcompat from oslo
* use six replace usage of py3kcompat

Change-Id: Ifc9be2cc36c93d298402bd430be35b541c9b7eba
Closes-Bug: #1280033
---
 neutron/openstack/common/network_utils.py     | 16 ++++-
 .../openstack/common/py3kcompat/__init__.py   |  0
 .../openstack/common/py3kcompat/urlutils.py   | 65 -------------------
 openstack-common.conf                         |  1 -
 4 files changed, 13 insertions(+), 69 deletions(-)
 delete mode 100644 neutron/openstack/common/py3kcompat/__init__.py
 delete mode 100644 neutron/openstack/common/py3kcompat/urlutils.py

diff --git a/neutron/openstack/common/network_utils.py b/neutron/openstack/common/network_utils.py
index 29061519a..d9640d15a 100644
--- a/neutron/openstack/common/network_utils.py
+++ b/neutron/openstack/common/network_utils.py
@@ -17,7 +17,17 @@
 Network-related utilities and helper functions.
 """
 
-from neutron.openstack.common.py3kcompat import urlutils
+# TODO(jd) Use six.moves once
+# https://bitbucket.org/gutworth/six/pull-request/28
+# is merged
+try:
+    import urllib.parse
+    SplitResult = urllib.parse.SplitResult
+except ImportError:
+    import urlparse
+    SplitResult = urlparse.SplitResult
+
+from six.moves.urllib import parse
 
 
 def parse_host_port(address, default_port=None):
@@ -70,10 +80,10 @@ def urlsplit(url, scheme='', allow_fragments=True):
 
     The parameters are the same as urlparse.urlsplit.
     """
-    scheme, netloc, path, query, fragment = urlutils.urlsplit(
+    scheme, netloc, path, query, fragment = parse.urlsplit(
         url, scheme, allow_fragments)
     if allow_fragments and '#' in path:
         path, fragment = path.split('#', 1)
     if '?' in path:
         path, query = path.split('?', 1)
-    return urlutils.SplitResult(scheme, netloc, path, query, fragment)
+    return SplitResult(scheme, netloc, path, query, fragment)
diff --git a/neutron/openstack/common/py3kcompat/__init__.py b/neutron/openstack/common/py3kcompat/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/neutron/openstack/common/py3kcompat/urlutils.py b/neutron/openstack/common/py3kcompat/urlutils.py
deleted file mode 100644
index 6200271f3..000000000
--- a/neutron/openstack/common/py3kcompat/urlutils.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# Copyright 2013 Canonical Ltd.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-#
-
-"""
-Python2/Python3 compatibility layer for OpenStack
-"""
-
-import six
-
-if six.PY3:
-    # python3
-    import urllib.error
-    import urllib.parse
-    import urllib.request
-
-    urlencode = urllib.parse.urlencode
-    urljoin = urllib.parse.urljoin
-    quote = urllib.parse.quote
-    parse_qsl = urllib.parse.parse_qsl
-    unquote = urllib.parse.unquote
-    unquote_plus = urllib.parse.unquote_plus
-    urlparse = urllib.parse.urlparse
-    urlsplit = urllib.parse.urlsplit
-    urlunsplit = urllib.parse.urlunsplit
-    SplitResult = urllib.parse.SplitResult
-
-    urlopen = urllib.request.urlopen
-    URLError = urllib.error.URLError
-    pathname2url = urllib.request.pathname2url
-else:
-    # python2
-    import urllib
-    import urllib2
-    import urlparse
-
-    urlencode = urllib.urlencode
-    quote = urllib.quote
-    unquote = urllib.unquote
-    unquote_plus = urllib.unquote_plus
-
-    parse = urlparse
-    parse_qsl = parse.parse_qsl
-    urljoin = parse.urljoin
-    urlparse = parse.urlparse
-    urlsplit = parse.urlsplit
-    urlunsplit = parse.urlunsplit
-    SplitResult = parse.SplitResult
-
-    urlopen = urllib2.urlopen
-    URLError = urllib2.URLError
-    pathname2url = urllib.pathname2url
diff --git a/openstack-common.conf b/openstack-common.conf
index 2e2e59297..7f5f95f2c 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -22,7 +22,6 @@ module=notifier
 module=periodic_task
 module=policy
 module=processutils
-module=py3kcompat
 module=rpc
 module=service
 module=sslutils
-- 
2.45.2