~corey.bryant/python-keystoneclient/1.6.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