diff options
| -rw-r--r-- | heat/openstack/common/py3kcompat/__init__.py | 16 | ||||
| -rw-r--r-- | heat/openstack/common/py3kcompat/urlutils.py | 63 | ||||
| -rw-r--r-- | openstack-common.conf | 1 |
3 files changed, 80 insertions, 0 deletions
diff --git a/heat/openstack/common/py3kcompat/__init__.py b/heat/openstack/common/py3kcompat/__init__.py new file mode 100644 index 000000000..97ae4e34a --- /dev/null +++ b/heat/openstack/common/py3kcompat/__init__.py @@ -0,0 +1,16 @@ +# +# 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/heat/openstack/common/py3kcompat/urlutils.py b/heat/openstack/common/py3kcompat/urlutils.py new file mode 100644 index 000000000..51e18111a --- /dev/null +++ b/heat/openstack/common/py3kcompat/urlutils.py @@ -0,0 +1,63 @@ +# +# 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 + 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 + + 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 79a6d2042..0af06520a 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -23,6 +23,7 @@ module=timeutils module=uuidutils module=config module=strutils +module=py3kcompat # The base module to hold the copy of openstack.common base=heat |