From 70c79a59792dd4147e451096105cf461a576464f Mon Sep 17 00:00:00 2001
From: Jamie Lennox <jlennox@redhat.com>
Date: Wed, 21 Aug 2013 10:08:34 +1000
Subject: [PATCH] Restore client.py for backward compatibility

Simply pull in HTTPClient from its new location. This also restores the
tests that were modified back to there original form to make sure
nothing has changed from the original.

Fixes: bug 1211998
Change-Id: Ia3241a4352eb6b37c6489cd4dd1bc373de107e12
---
 keystoneclient/client.py | 18 ++++++++++++++++++
 tests/test_http.py       | 13 +++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 keystoneclient/client.py

diff --git a/keystoneclient/client.py b/keystoneclient/client.py
new file mode 100644
index 000000000..bfd69ab29
--- /dev/null
+++ b/keystoneclient/client.py
@@ -0,0 +1,18 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# 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.
+
+from keystoneclient import httpclient
+
+# Using client.HTTPClient is deprecated. Use httpclient.HTTPClient instead.
+HTTPClient = httpclient.HTTPClient
diff --git a/tests/test_http.py b/tests/test_http.py
index 9ab3dcced..b44a297b0 100644
--- a/tests/test_http.py
+++ b/tests/test_http.py
@@ -152,6 +152,19 @@ class ClientTest(utils.TestCase):
                                                 httpclient.USER_AGENT)),
                 kwargs['headers'].items())
 
+    def test_client_deprecated(self):
+        # Can resolve symbols from the keystoneclient.client module.
+        # keystoneclient.client was deprecated and renamed to
+        # keystoneclient.httpclient. This tests that keystoneclient.client
+        # can still be used.
+
+        from keystoneclient import client
+
+        # These statements will raise an AttributeError if the symbol isn't
+        # defined in the module.
+
+        client.HTTPClient
+
 
 class BasicRequestTests(testtools.TestCase):