From 7bdf2526b749011e0069108fb0bad3d738fdb133 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Tue, 15 Apr 2014 10:47:56 +0200
Subject: [PATCH] Remove py3k module

This module is obsolete and has been dropped from oslo-incubator.
Use six instead (which is already done here).

Change-Id: I8e0b49cdfbddcf2d44a601ad06be2e75897905fc
---
 .../openstack/common/py3kcompat/__init__.py   | 16 -----
 .../openstack/common/py3kcompat/urlutils.py   | 65 -------------------
 openstack-common.conf                         |  1 -
 3 files changed, 82 deletions(-)
 delete mode 100644 glanceclient/openstack/common/py3kcompat/__init__.py
 delete mode 100644 glanceclient/openstack/common/py3kcompat/urlutils.py

diff --git a/glanceclient/openstack/common/py3kcompat/__init__.py b/glanceclient/openstack/common/py3kcompat/__init__.py
deleted file mode 100644
index 97ae4e3..0000000
--- a/glanceclient/openstack/common/py3kcompat/__init__.py
+++ /dev/null
@@ -1,16 +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.
-#
diff --git a/glanceclient/openstack/common/py3kcompat/urlutils.py b/glanceclient/openstack/common/py3kcompat/urlutils.py
deleted file mode 100644
index 6200271..0000000
--- a/glanceclient/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 4274546..ec91c8e 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -5,7 +5,6 @@ module=apiclient
 module=gettextutils
 module=importutils
 module=network_utils
-module=py3kcompat
 module=strutils
 
 # The base module to hold the copy of openstack.common