diff --git a/keystoneclient/client.py b/keystoneclient/client.py index 0233aeb6..14c38b06 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,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 @@ -336,7 +333,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 695fe020..4de4a2c4 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 6e8dbaf8..9d9bf8d6 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 e2a1412a..bfb38615 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 f93089ee..81d06638 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -1,5 +1,5 @@ argparse iso8601>=0.1.4 prettytable -requests>=0.8.8,<1.0 +requests>=0.8.8 simplejson