Merge lp:~zulcss/python-keystoneclient/fix-requests-2 into lp:~openstack-ubuntu-testing/python-keystoneclient/grizzly

[Chuck Short]

More complete fix.

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/patches/fix-requests-requirements.patch'
--- debian/patches/fix-requests-requirements.patch	2013-02-05 15:59:46 +0000
+++ debian/patches/fix-requests-requirements.patch	2013-02-06 16:05:01 +0000
@@ -1,6 +1,112 @@
-diff -Naurp python-keystoneclient.orig/tools/pip-requires python-keystoneclient/tools/pip-requires
---- python-keystoneclient.orig/tools/pip-requires	2013-02-05 09:58:02.814039981 -0600
-+++ python-keystoneclient/tools/pip-requires	2013-02-05 09:58:19.802040386 -0600
+From cfb84dd5c6c3d66c6ccc5818f4338b027f8eff44 Mon Sep 17 00:00:00 2001
+From: Chuck Short <[e-mail]>
+Date: Wed, 6 Feb 2013 09:36:51 -0600
+Subject: [PATCH] Allow requests up to 1.1
+
+The requests module dropped all configuration with the 1.0.0 release.
+There's no danger_mode and no 'verbose'' mode. The former
+shouldn't be necessary anymore and the latter can be done by setting
+a different log handler for the request.logging root logger.
+
+Signed-off-by: Chuck Short <[e-mail]>
+---
+ keystoneclient/client.py | 7 +------
+ tests/test_shell.py      | 3 +--
+ tests/utils.py           | 2 --
+ tests/v3/utils.py        | 2 --
+ tools/pip-requires       | 2 +-
+ 5 files changed, 3 insertions(+), 13 deletions(-)
+
+diff --git a/keystoneclient/client.py b/keystoneclient/client.py
+index 77e8b3c..94617b7 100644
+--- a/keystoneclient/client.py
++++ b/keystoneclient/client.py
+@@ -50,10 +50,6 @@ class HTTPClient(object):
+ 
+     USER_AGENT = 'python-keystoneclient'
+ 
+-    requests_config = {
+-        'danger_mode': False,
+-    }
+-
+     def __init__(self, username=None, tenant_id=None, tenant_name=None,
+                  password=None, auth_url=None, region_name=None, timeout=None,
+                  endpoint=None, token=None, cacert=None, key=None,
+@@ -121,7 +117,7 @@ class HTTPClient(object):
+             ch = logging.StreamHandler()
+             _logger.setLevel(logging.DEBUG)
+             _logger.addHandler(ch)
+-            self.requests_config['verbose'] = sys.stderr
++            requests.logging.getLogger(requests.__name__).addHandler(ch)
+ 
+         # keyring setup
+         self.use_keyring = use_keyring and keyring_available
+@@ -336,7 +332,6 @@ class HTTPClient(object):
+             method,
+             url,
+             verify=self.verify_cert,
+-            config=self.requests_config,
+             **request_kwargs)
+ 
+         self.http_log_resp(resp)
+diff --git a/tests/test_shell.py b/tests/test_shell.py
+index 695fe02..4de4a2c 100644
+--- a/tests/test_shell.py
++++ b/tests/test_shell.py
+@@ -327,8 +327,7 @@ class ShellTest(utils.TestCase):
+             request_mock.assert_called_with(mock.ANY, mock.ANY,
+                                             timeout=2,
+                                             headers=mock.ANY,
+-                                            verify=mock.ANY,
+-                                            config=mock.ANY)
++                                            verify=mock.ANY)
+ 
+     def test_do_endpoints(self):
+         do_shell_mock = mock.MagicMock()
+diff --git a/tests/utils.py b/tests/utils.py
+index 6e8dbaf..9d9bf8d 100644
+--- a/tests/utils.py
++++ b/tests/utils.py
+@@ -17,7 +17,6 @@ class TestCase(testtools.TestCase):
+     TEST_ROOT_ADMIN_URL = 'http://127.0.0.1:35357/'
+     TEST_ADMIN_URL = '%s%s' % (TEST_ROOT_ADMIN_URL, 'v2.0')
+     TEST_REQUEST_BASE = {
+-        'config': {'danger_mode': False},
+         'verify': True,
+     }
+ 
+@@ -94,7 +93,6 @@ class UnauthenticatedTestCase(testtools.TestCase):
+     TEST_ROOT_ADMIN_URL = 'http://127.0.0.1:35357/'
+     TEST_ADMIN_URL = '%s%s' % (TEST_ROOT_ADMIN_URL, 'v2.0')
+     TEST_REQUEST_BASE = {
+-        'config': {'danger_mode': False},
+         'verify': True,
+     }
+ 
+diff --git a/tests/v3/utils.py b/tests/v3/utils.py
+index e2a1412..bfb3861 100644
+--- a/tests/v3/utils.py
++++ b/tests/v3/utils.py
+@@ -40,7 +40,6 @@ class TestCase(testtools.TestCase):
+     TEST_ROOT_ADMIN_URL = 'http://127.0.0.1:35357/'
+     TEST_ADMIN_URL = '%s%s' % (TEST_ROOT_ADMIN_URL, 'v3')
+     TEST_REQUEST_BASE = {
+-        'config': {'danger_mode': False},
+         'verify': True,
+     }
+ 
+@@ -70,7 +69,6 @@ class UnauthenticatedTestCase(testtools.TestCase):
+     TEST_ROOT_ADMIN_URL = 'http://127.0.0.1:35357/'
+     TEST_ADMIN_URL = '%s%s' % (TEST_ROOT_ADMIN_URL, 'v3')
+     TEST_REQUEST_BASE = {
+-        'config': {'danger_mode': False},
+         'verify': True,
+     }
+ 
+diff --git a/tools/pip-requires b/tools/pip-requires
+index f93089e..f9cc6e8 100644
+--- a/tools/pip-requires
++++ b/tools/pip-requires
 @@ -1,5 +1,5 @@
  argparse
  iso8601>=0.1.4
@@ -8,3 +114,6 @@
 -requests>=0.8.8,<1.0
 +requests>=0.8.8,<=1.1
  simplejson
+-- 
+1.8.1.2
+