diff options
| author | Chuck Short <chuck.short@canonical.com> | 2013-07-12 15:42:52 -0400 |
|---|---|---|
| committer | Chuck Short <chuck.short@canonical.com> | 2013-08-04 23:51:14 +0000 |
| commit | 4d12ad1a803234f1cba2dc5011a33902adf55589 (patch) | |
| tree | 0aa505a85dbe323c4b8ebc22a8f0ff4688b5837d /openstack | |
| parent | ca0ca29e3f04ced20f62c33ad8b5bf7492775824 (diff) | |
| download | oslo-4d12ad1a803234f1cba2dc5011a33902adf55589.tar.gz oslo-4d12ad1a803234f1cba2dc5011a33902adf55589.tar.xz oslo-4d12ad1a803234f1cba2dc5011a33902adf55589.zip | |
python3: Import translation layer
Python3 reorganized the standard library and moved several functions
to different modules. Six provides a consistent interface
to them through the fake six.moves module.
However, the urlparse, urllib2, etc modules have been combined
into one module which Six does not support so do it the old
fashioned way.
Change-Id: I9a865ef1fc4de6f94cc3ccf26db0483f2bdc13df
Signed-off-by: Chuck Short <chuck.short@canonical.com>
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/py3kcompat/__init__.py | 17 | ||||
| -rw-r--r-- | openstack/common/py3kcompat/urlutils.py | 47 |
2 files changed, 64 insertions, 0 deletions
diff --git a/openstack/common/py3kcompat/__init__.py b/openstack/common/py3kcompat/__init__.py new file mode 100644 index 0000000..be894cf --- /dev/null +++ b/openstack/common/py3kcompat/__init__.py @@ -0,0 +1,17 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 +# +# 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/openstack/common/py3kcompat/urlutils.py b/openstack/common/py3kcompat/urlutils.py new file mode 100644 index 0000000..4471021 --- /dev/null +++ b/openstack/common/py3kcompat/urlutils.py @@ -0,0 +1,47 @@ +# vim: tabstop=4 shiftwidth=4 softtabstop=4 +# +# 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.parse + + urlencode = urllib.parse.urlencode + quote = urllib.parse.quote + parse_qsl = urllib.parse.parse_qsl + urlparse = urllib.parse.urlparse + urlsplit = urllib.parse.urlsplit + urlunsplit = urllib.parse.urlunsplit +else: + # python2 + import urllib + import urlparse + + urlencode = urllib.urlencode + quote = urllib.quote + + parse = urlparse + parse_qsl = parse.parse_qsl + urlparse = parse.urlparse + urlsplit = parse.urlsplit + urlunsplit = parse.urlunsplit |