From 689e7d09e023f665c453d1fd7f1eb57ba10a0bb0 Mon Sep 17 00:00:00 2001
From: Steve Martinelli <stevemar@ca.ibm.com>
Date: Wed, 16 Dec 2015 02:51:11 -0500
Subject: [PATCH] remove keystoneclient.apiclient.exceptions

these have been deprecated in favor of keystoneclient.exceptions
for a very long time. let's finally remove them.

Change-Id: I0fc06a12647a0faac5ba98ed83118269efc304a6
Closes-Bug: 1526651
---
 keystoneclient/apiclient/__init__.py          | 41 -------------------
 keystoneclient/apiclient/exceptions.py        | 34 ---------------
 ...apiclient_exceptions-6580003a885db286.yaml | 10 +++++
 3 files changed, 10 insertions(+), 75 deletions(-)
 delete mode 100644 keystoneclient/apiclient/__init__.py
 delete mode 100644 keystoneclient/apiclient/exceptions.py
 create mode 100644 releasenotes/notes/remove_apiclient_exceptions-6580003a885db286.yaml

diff --git a/keystoneclient/apiclient/__init__.py b/keystoneclient/apiclient/__init__.py
deleted file mode 100644
index cda401aa2..000000000
--- a/keystoneclient/apiclient/__init__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2013 OpenStack Foundation
-# 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.
-
-"""Deprecated.
-
-.. warning::
-
-  This module is deprecated as of the 1.7.0 release in favor of
-  :py:mod:`keystoneclient.exceptions` and may be removed in the 2.0.0 release.
-
-"""
-
-from debtcollector import removals
-
-from keystoneclient import exceptions
-
-# NOTE(akurilin): Module 'keystoneclient.apiclient' contains only exceptions
-# which are deprecated, so this module must also be deprecated which helps
-# to report 'deprecated' status of exceptions for next kind of imports
-#       from keystoneclient.apiclient import exceptions
-
-removals.removed_module('keystoneclient.apiclient',
-                        replacement='keystoneclient.exceptions',
-                        version='0.7.1',
-                        removal_version='2.0')
-
-__all__ = (
-    'exceptions',
-)
diff --git a/keystoneclient/apiclient/exceptions.py b/keystoneclient/apiclient/exceptions.py
deleted file mode 100644
index 99d9ec2e6..000000000
--- a/keystoneclient/apiclient/exceptions.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2010 Jacob Kaplan-Moss
-# Copyright 2011 Nebula, Inc.
-# Copyright 2013 Alessio Ababilov
-# Copyright 2013 OpenStack Foundation
-# 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.
-
-"""
-Exception definitions.
-
-Deprecated since v0.7.1. Use 'keystoneclient.exceptions' instead of
-this module. This module may be removed in the 2.0.0 release.
-"""
-
-from debtcollector import removals
-
-from keystoneclient.exceptions import *     # noqa
-
-
-removals.removed_module('keystoneclient.apiclient.exceptions',
-                        replacement='keystoneclient.exceptions',
-                        version='0.7.1',
-                        removal_version='2.0')
diff --git a/releasenotes/notes/remove_apiclient_exceptions-6580003a885db286.yaml b/releasenotes/notes/remove_apiclient_exceptions-6580003a885db286.yaml
new file mode 100644
index 000000000..1fbe6b72b
--- /dev/null
+++ b/releasenotes/notes/remove_apiclient_exceptions-6580003a885db286.yaml
@@ -0,0 +1,10 @@
+---
+prelude: >
+    keystoneclient.apiclient has been removed.
+critical:
+  - >
+    [`bug 1526651 <https://bugs.launchpad.net/python-keystoneclient/+bug/1526651>`_]
+    The `keystoneclient.apiclient` module has been removed in favor of
+    `keystoneclient.exceptions`. The aforementioned module has been deprecated
+    since keystoneclient v0.7.1 which was inclued in the Juno release
+    of OpenStack.