Merge lp:~zulcss/python-keystoneclient/requests-patch-drop into lp:~openstack-ubuntu-testing/python-keystoneclient/grizzly

[Chuck Short]

drops the requests version bump patch.

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-11 18:32:48 +0000
+++ debian/changelog	2013-02-12 15:15:45 +0000
@@ -1,3 +1,9 @@
+python-keystoneclient (1:0.2.2-0ubuntu3) UNRELEASED; urgency=low
+
+  * debian/patches/fix-requests-requirements.patch: Dropped. 
+
+ -- Chuck Short <[e-mail]>  Tue, 12 Feb 2013 09:05:38 -0600
+
 python-keystoneclient (1:0.2.2-0ubuntu2) raring; urgency=low
 
   * debian/patches/fix-requests-requirements.patch: Bump python-requests

=== removed file 'debian/patches/fix-requests-requirements.patch'
--- debian/patches/fix-requests-requirements.patch	2013-02-11 18:39:26 +0000
+++ debian/patches/fix-requests-requirements.patch	1970-01-01 00:00:00 +0000
@@ -1,80 +0,0 @@
-diff -Naurp python-keystoneclient-0.2.2.orig/keystoneclient/client.py python-keystoneclient-0.2.2/keystoneclient/client.py
---- python-keystoneclient-0.2.2.orig/keystoneclient/client.py	2013-01-14 12:27:07.000000000 -0600
-+++ python-keystoneclient-0.2.2/keystoneclient/client.py	2013-02-11 12:34:25.832610713 -0600
-@@ -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,
-@@ -113,7 +109,8 @@ class HTTPClient(object):
-             ch = logging.StreamHandler()
-             _logger.setLevel(logging.DEBUG)
-             _logger.addHandler(ch)
--            self.requests_config['verbose'] = sys.stderr
-+            if hasattr(requests, logging):
-+                requests.logging.getLogger(requests.__name__).addHandler(ch)
- 
-         # keyring setup
-         self.use_keyring = use_keyring and keyring_available
-@@ -326,7 +323,6 @@ class HTTPClient(object):
-             method,
-             url,
-             verify=self.verify_cert,
--            config=self.requests_config,
-             **request_kwargs)
- 
-         self.http_log_resp(resp)
-diff -Naurp python-keystoneclient-0.2.2.orig/tests/utils.py python-keystoneclient-0.2.2/tests/utils.py
---- python-keystoneclient-0.2.2.orig/tests/utils.py	2013-01-14 12:27:07.000000000 -0600
-+++ python-keystoneclient-0.2.2/tests/utils.py	2013-02-11 12:38:18.044610825 -0600
-@@ -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.
-     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 -Naurp python-keystoneclient-0.2.2.orig/tests/v3/utils.py python-keystoneclient-0.2.2/tests/v3/utils.py
---- python-keystoneclient-0.2.2.orig/tests/v3/utils.py	2013-01-14 12:27:07.000000000 -0600
-+++ python-keystoneclient-0.2.2/tests/v3/utils.py	2013-02-11 12:38:21.196610827 -0600
-@@ -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.
-     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 -Naurp python-keystoneclient-0.2.2.orig/tools/pip-requires python-keystoneclient-0.2.2/tools/pip-requires
---- python-keystoneclient-0.2.2.orig/tools/pip-requires	2013-01-14 12:27:07.000000000 -0600
-+++ python-keystoneclient-0.2.2/tools/pip-requires	2013-02-11 12:38:32.392610832 -0600
-@@ -1,5 +1,5 @@
- argparse
- iso8601>=0.1.4
- prettytable
--requests>=0.8.8,<1.0
-+requests>=0.8.8
- simplejson

=== removed file 'debian/patches/series'
--- debian/patches/series	2013-02-05 15:59:46 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-fix-requests-requirements.patch