diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-08-05 10:06:34 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-08-05 10:06:34 +0000 |
commit | c8cf9d7e0508d83000100bd6c1685ee5db9322d5 (patch) | |
tree | d48298caffb689b9d81f306f55e58fddfe036ef8 /openstack | |
parent | a7dbed3b3f02282da5ba171369915783910c0e4c (diff) | |
parent | 4d12ad1a803234f1cba2dc5011a33902adf55589 (diff) | |
download | oslo-c8cf9d7e0508d83000100bd6c1685ee5db9322d5.tar.gz oslo-c8cf9d7e0508d83000100bd6c1685ee5db9322d5.tar.xz oslo-c8cf9d7e0508d83000100bd6c1685ee5db9322d5.zip |
Merge "python3: Import translation layer"
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 |