Merge lp:~zulcss/python-novaclient/novaclient-requests into lp:~openstack-ubuntu-testing/python-novaclient/grizzly

[Chuck Short]

[Adam Gandelman (gandelman-a)]

LGTM assuming it gets updated/dropped according to current review @ https://review.openstack.org/#/c/20119/

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-17 14:02:55 +0000
+++ debian/changelog	2013-02-05 16:55:27 +0000
@@ -4,6 +4,8 @@
   * debian/control: Add python-requests as a build-dep.
   * debian/control: Add python-fixtures as a build-dep.
   * debian/control: Use python-testtools instead of python-unittest2
+  * debian/patches/fix-requests-requirements.patch: Fix python-requests
+    requirements.
 
  -- Chuck Short <[e-mail]>  Sat, 29 Dec 2012 12:57:45 -0600
 

=== added directory 'debian/patches'
=== added file 'debian/patches/fix-requests-requirements.patch'
--- debian/patches/fix-requests-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-requests-requirements.patch	2013-02-05 16:55:27 +0000
@@ -0,0 +1,75 @@
+From 055823d99b4a5fd6350b29ba6b0b8c939ee2deef Mon Sep 17 00:00:00 2001
+From: Sascha Peilicke <[e-mail]>
+Date: Mon, 21 Jan 2013 12:00:54 +0100
+Subject: [PATCH] Update to requests >= 1.0.0
+
+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.
+
+Change-Id: Iec169ef6e39097814cdbf1b777bc0590236692ba
+---
+ novaclient/client.py | 7 +------
+ tests/utils.py       | 1 -
+ tools/pip-requires   | 2 +-
+ 3 files changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/novaclient/client.py b/novaclient/client.py
+index 9b97979..e66a545 100644
+--- a/novaclient/client.py
++++ b/novaclient/client.py
+@@ -51,10 +51,6 @@ class HTTPClient(object):
+ 
+     USER_AGENT = 'python-novaclient'
+ 
+-    requests_config = {
+-        'danger_mode': False,
+-    }
+-
+     def __init__(self, user, password, projectid, auth_url=None,
+                  insecure=False, timeout=None, proxy_tenant_id=None,
+                  proxy_token=None, region_name=None,
+@@ -106,7 +102,7 @@ class HTTPClient(object):
+             ch = logging.StreamHandler()
+             self._logger.setLevel(logging.DEBUG)
+             self._logger.addHandler(ch)
+-            self.requests_config['verbose'] = sys.stderr
++            requests.logging.getLogger(requests.__name__).addHandler(ch)
+ 
+     def use_token_cache(self, use_it):
+         self.os_cache = use_it
+@@ -168,7 +164,6 @@ class HTTPClient(object):
+             method,
+             url,
+             verify=self.verify_cert,
+-            config=self.requests_config,
+             **kwargs)
+         self.http_log_resp(resp)
+ 
+diff --git a/tests/utils.py b/tests/utils.py
+index ef231a7..0c9cb89 100644
+--- a/tests/utils.py
++++ b/tests/utils.py
+@@ -4,7 +4,6 @@ import testtools
+ 
+ class TestCase(testtools.TestCase):
+     TEST_REQUEST_BASE = {
+-        'config': {'danger_mode': False},
+         'verify': True,
+     }
+ 
+diff --git a/tools/pip-requires b/tools/pip-requires
+index 7fbcbbe..a64ff5a 100644
+--- a/tools/pip-requires
++++ b/tools/pip-requires
+@@ -1,5 +1,5 @@
+ argparse
+ iso8601>=0.1.4
+ prettytable>=0.6,<0.7
+-requests<1.0
++requests>=1.0.0
+ simplejson
+-- 
+1.8.1.2
+

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-02-05 16:55:27 +0000
@@ -0,0 +1,1 @@
+fix-requests-requirements.patch