diff --git a/openstackclient/api/auth.py b/openstackclient/api/auth.py deleted file mode 100644 index 7c520f4964..0000000000 --- a/openstackclient/api/auth.py +++ /dev/null @@ -1,28 +0,0 @@ -# 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. -# - -# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release -# or Jun 2017. - -import inspect -import sys - -from osc_lib.api.auth import * # noqa - - -parent_import = inspect.getouterframes(inspect.currentframe())[1][1] -sys.stderr.write( - "WARNING: %s is deprecated and will be removed after Jun 2017. " - "Please use osc_lib.api.auth. This warning is caused by an " - "out-of-date import in %s\n" % (__name__, parent_import) -) diff --git a/openstackclient/common/command.py b/openstackclient/common/command.py deleted file mode 100644 index 44954da337..0000000000 --- a/openstackclient/common/command.py +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2016 NEC Corporation -# -# 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. - -# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release -# or Jun 2017. - -import inspect -import sys - -from osc_lib.command.command import * # noqa - - -parent_import = inspect.getouterframes(inspect.currentframe())[1][1] -sys.stderr.write( - "WARNING: %s is deprecated and will be removed after Jun 2017. " - "Please use osc_lib.command.command. This warning is caused by an " - "out-of-date import in %s\n" % (__name__, parent_import) -) diff --git a/openstackclient/common/exceptions.py b/openstackclient/common/exceptions.py deleted file mode 100644 index ed497e7bac..0000000000 --- a/openstackclient/common/exceptions.py +++ /dev/null @@ -1,28 +0,0 @@ -# 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. -# - -# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release -# or Jun 2017. - -import inspect -import sys - -from osc_lib.exceptions import * # noqa - - -parent_import = inspect.getouterframes(inspect.currentframe())[1][1] -sys.stderr.write( - "WARNING: %s is deprecated and will be removed after Jun 2017. " - "Please use osc_lib.exceptions. This warning is caused by an " - "out-of-date import in %s\n" % (__name__, parent_import) -) diff --git a/openstackclient/common/logs.py b/openstackclient/common/logs.py deleted file mode 100644 index 24bf07eb39..0000000000 --- a/openstackclient/common/logs.py +++ /dev/null @@ -1,29 +0,0 @@ -# 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. -# - -# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release -# or Jun 2017. - -import inspect -import sys - -from osc_lib.logs import * # noqa -from osc_lib.logs import _FileFormatter # noqa - - -parent_import = inspect.getouterframes(inspect.currentframe())[1][1] -sys.stderr.write( - "WARNING: %s is deprecated and will be removed after Jun 2017. " - "Please use osc_lib.logs. This warning is caused by an " - "out-of-date import in %s\n" % (__name__, parent_import) -) diff --git a/openstackclient/common/parseractions.py b/openstackclient/common/parseractions.py deleted file mode 100644 index 3af3a017f7..0000000000 --- a/openstackclient/common/parseractions.py +++ /dev/null @@ -1,28 +0,0 @@ -# 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. -# - -# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release -# or Jun 2017. - -import inspect -import sys - -from osc_lib.cli.parseractions import * # noqa - - -parent_import = inspect.getouterframes(inspect.currentframe())[1][1] -sys.stderr.write( - "WARNING: %s is deprecated and will be removed after Jun 2017. " - "Please use osc_lib.cli.parseractions. This warning is caused by an " - "out-of-date import in %s\n" % (__name__, parent_import) -) diff --git a/openstackclient/common/session.py b/openstackclient/common/session.py deleted file mode 100644 index 9b19fd46e9..0000000000 --- a/openstackclient/common/session.py +++ /dev/null @@ -1,50 +0,0 @@ -# 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. -# - -"""Subclass of keystoneauth1.session""" - -from keystoneauth1 import session - - -class TimingSession(session.Session): - """A Session that supports collection of timing data per Method URL""" - - def __init__( - self, - **kwargs - ): - """Pass through all arguments except timing""" - super(TimingSession, self).__init__(**kwargs) - - # times is a list of tuples: ("method url", elapsed_time) - self.times = [] - - def get_timings(self): - return self.times - - def reset_timings(self): - self.times = [] - - def request(self, url, method, **kwargs): - """Wrap the usual request() method with the timers""" - resp = super(TimingSession, self).request(url, method, **kwargs) - for h in resp.history: - self.times.append(( - "%s %s" % (h.request.method, h.request.url), - h.elapsed, - )) - self.times.append(( - "%s %s" % (resp.request.method, resp.request.url), - resp.elapsed, - )) - return resp diff --git a/openstackclient/common/timing.py b/openstackclient/common/timing.py deleted file mode 100644 index 444f0cb2ea..0000000000 --- a/openstackclient/common/timing.py +++ /dev/null @@ -1,28 +0,0 @@ -# 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. -# - -# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release -# or Jun 2017. - -import inspect -import sys - -from osc_lib.command.timing import * # noqa - - -parent_import = inspect.getouterframes(inspect.currentframe())[1][1] -sys.stderr.write( - "WARNING: %s is deprecated and will be removed after Jun 2017. " - "Please use osc_lib.command.timing. This warning is caused by an " - "out-of-date import in %s\n" % (__name__, parent_import) -) diff --git a/openstackclient/common/utils.py b/openstackclient/common/utils.py deleted file mode 100644 index aeb3aea7e3..0000000000 --- a/openstackclient/common/utils.py +++ /dev/null @@ -1,28 +0,0 @@ -# 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. -# - -# NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release -# or Jun 2017. - -import inspect -import sys - -from osc_lib.utils import * # noqa - - -parent_import = inspect.getouterframes(inspect.currentframe())[1][1] -sys.stderr.write( - "WARNING: %s is deprecated and will be removed after Jun 2017. " - "Please use osc_lib.utils. This warning is caused by an " - "out-of-date import in %s\n" % (__name__, parent_import) -) diff --git a/openstackclient/tests/unit/network/test_common.py b/openstackclient/tests/unit/network/test_common.py index d4d3a277f4..3a20687824 100644 --- a/openstackclient/tests/unit/network/test_common.py +++ b/openstackclient/tests/unit/network/test_common.py @@ -15,8 +15,8 @@ import argparse import mock import openstack +from osc_lib import exceptions -from openstackclient.common import exceptions from openstackclient.network import common from openstackclient.tests.unit import utils