From 0c0eb4131054d70aeeb46ce0c2e51b35fd436c0b Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Sun, 4 May 2014 12:08:21 +0800 Subject: [PATCH] Clean up openstack-common.conf oslo-incubator will introduce new integrity check in [1]. That will help developer find inconsistent issue while copying from oslo-incubator. The check just outputs warnings. These are changes according to warning: * remove unused module py3kcompat * add missing module context, processutils in openstack-common.conf * sort the modules in openstack-common.conf [1] https://review.openstack.org/#/c/76901/ Change-Id: I2fea01148f6ad268a5fcfdaa788e30d6fcb48c3f Related-Bug: #1295582 --- heat/openstack/common/py3kcompat/__init__.py | 0 heat/openstack/common/py3kcompat/urlutils.py | 67 -------------------- openstack-common.conf | 12 ++-- 3 files changed, 7 insertions(+), 72 deletions(-) delete mode 100644 heat/openstack/common/py3kcompat/__init__.py delete mode 100644 heat/openstack/common/py3kcompat/urlutils.py diff --git a/heat/openstack/common/py3kcompat/__init__.py b/heat/openstack/common/py3kcompat/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/heat/openstack/common/py3kcompat/urlutils.py b/heat/openstack/common/py3kcompat/urlutils.py deleted file mode 100644 index 84e457a44f..0000000000 --- a/heat/openstack/common/py3kcompat/urlutils.py +++ /dev/null @@ -1,67 +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 - quote_plus = urllib.parse.quote_plus - 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 - quote_plus = urllib.quote_plus - 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 af8d1c5b6d..28a89bbedb 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -1,6 +1,9 @@ [DEFAULT] -# The list of modules to copy from openstack-common +# The list of modules to copy from oslo-incubator +module=config +module=context +module=crypto module=db module=db.sqlalchemy module=eventlet_backdoor @@ -16,16 +19,15 @@ module=loopingcall module=network_utils module=notifier module=policy +module=processutils module=rpc module=service +module=strutils +module=test module=threadgroup module=timeutils module=uuidutils -module=config -module=strutils module=versionutils -module=test -module=crypto # The base module to hold the copy of openstack.common base=heat