From 16d1cc1af2e40a43a1f5c7c4ad44b39308789aa2 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Mon, 7 Nov 2016 13:31:55 -0500 Subject: [PATCH] remove final vestiges of incubated oslo code Remove the sync config file, remaining unimported modules, and update a couple of configuration files with references to the directory being removed. Change-Id: I56ae9b23a6d1d06d80fbb44adaca16ca079a7663 Story: 2000776 Signed-off-by: Doug Hellmann --- .coveragerc | 1 - openstack-common.conf | 7 -- storyboard/openstack/__init__.py | 0 storyboard/openstack/common/__init__.py | 2 - .../openstack/common/py3kcompat/__init__.py | 0 .../openstack/common/py3kcompat/urlutils.py | 67 ------------------- tox.ini | 4 +- 7 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 openstack-common.conf delete mode 100644 storyboard/openstack/__init__.py delete mode 100644 storyboard/openstack/common/__init__.py delete mode 100644 storyboard/openstack/common/py3kcompat/__init__.py delete mode 100644 storyboard/openstack/common/py3kcompat/urlutils.py diff --git a/.coveragerc b/.coveragerc index a07a4463..dfa88209 100644 --- a/.coveragerc +++ b/.coveragerc @@ -2,7 +2,6 @@ branch = True source = storyboard omit = - */openstack/common/* .tox/* storyboard/tests/* diff --git a/openstack-common.conf b/openstack-common.conf deleted file mode 100644 index a01b9d39..00000000 --- a/openstack-common.conf +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] - -# The list of modules to copy from oslo-incubator.git -module=processutils - -# The base module to hold the copy of openstack.common -base=storyboard diff --git a/storyboard/openstack/__init__.py b/storyboard/openstack/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/storyboard/openstack/common/__init__.py b/storyboard/openstack/common/__init__.py deleted file mode 100644 index 2a00f3bc..00000000 --- a/storyboard/openstack/common/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -import six -six.add_move(six.MovedModule('mox', 'mox', 'mox3.mox')) diff --git a/storyboard/openstack/common/py3kcompat/__init__.py b/storyboard/openstack/common/py3kcompat/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/storyboard/openstack/common/py3kcompat/urlutils.py b/storyboard/openstack/common/py3kcompat/urlutils.py deleted file mode 100644 index 84e457a4..00000000 --- a/storyboard/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/tox.ini b/tox.ini index 33fc6b29..d5021600 100644 --- a/tox.ini +++ b/tox.ini @@ -42,7 +42,7 @@ commands = python setup.py testr --coverage --testr-args='{posargs}' ignore = E125,E128,H803,H405,H234,H233,E265,H236 builtins = _ show-source = True -exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build +exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build [testenv:bindep] # Do not install any requirements. We want this to be fast and work even if @@ -53,4 +53,4 @@ deps = bindep commands = bindep test [hacking] -import_exceptions = storyboard._i18n \ No newline at end of file +import_exceptions = storyboard._i18n