ee537e33de
The common RPC code has been updated to include the following:
8575d87af49ea276341908f83c8c51db13afca44
8b2b0b743e84ceed7841cf470afed6a5da8e1d07
23f602940c64ba408d77ceb8f5ba0f67ee4a18ef
6d0a6c3083218cdac52758a8b6aac6b03402c658
7cac1ac1bd9df36d4e5183afac3b643df10b1d4d
8159efddabb09dd9b7c99963ff7c9de0a6c62b62
Updated to include the following in modules in openstack-common.conf:
py3kcompat, sslutils, and versionutils.
The update also includes imports from the RPC code
Change-Id: I84c5b8e2b17da0018dd69ecb354d123a609afe98
66 lines
1.8 KiB
Python
66 lines
1.8 KiB
Python
#
|
|
# 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
|