diff --git a/python-botocore.changes b/python-botocore.changes index 7ba0ed6..eb25b02 100644 --- a/python-botocore.changes +++ b/python-botocore.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Sep 24 17:50:34 UTC 2020 - Hans-Peter Jansen + +- Adjust remove_nose.patch to apply again + ------------------------------------------------------------------- Mon Sep 7 10:47:56 UTC 2020 - John Paul Adrian Glaubitz diff --git a/remove_nose.patch b/remove_nose.patch index 38aae47..a6cc26a 100644 --- a/remove_nose.patch +++ b/remove_nose.patch @@ -51,6 +51,8 @@ tests/unit/test_waiters.py | 2 50 files changed, 427 insertions(+), 465 deletions(-) +Index: b/setup.cfg +=================================================================== --- a/setup.cfg +++ b/setup.cfg @@ -13,3 +13,5 @@ requires-dist = @@ -60,6 +62,8 @@ +[tool:pytest] +markers = slow: marks tests as slow \ No newline at end of file +Index: b/tests/__init__.py +=================================================================== --- a/tests/__init__.py +++ b/tests/__init__.py @@ -13,7 +13,10 @@ @@ -110,6 +114,8 @@ class HTTPStubberException(Exception): +Index: b/tests/acceptance/features/steps/base.py +=================================================================== --- a/tests/acceptance/features/steps/base.py +++ b/tests/acceptance/features/steps/base.py @@ -4,7 +4,6 @@ from botocore import xform_name @@ -129,6 +135,8 @@ @then(u'the value at "{}" should be a list') +Index: b/tests/functional/csm/test_monitoring.py +=================================================================== --- a/tests/functional/csm/test_monitoring.py +++ b/tests/functional/csm/test_monitoring.py @@ -18,8 +18,7 @@ import os @@ -160,6 +168,8 @@ def _make_api_call(session, api_call): +Index: b/tests/functional/test_client_class_names.py +=================================================================== --- a/tests/functional/test_client_class_names.py +++ b/tests/functional/test_client_class_names.py @@ -10,11 +10,9 @@ @@ -196,6 +206,8 @@ + client = session.create_client(service_name, REGION) + self.assertEqual(client.__class__.__name__, + SERVICE_TO_CLASS_NAME[service_name]) +Index: b/tests/functional/test_cognito_idp.py +=================================================================== --- a/tests/functional/test_cognito_idp.py +++ b/tests/functional/test_cognito_idp.py @@ -10,9 +10,7 @@ @@ -228,6 +240,8 @@ + assert 'authorization' not in request.headers, \ 'authorization header found in unsigned operation' - ) +Index: b/tests/functional/test_endpoints.py +=================================================================== --- a/tests/functional/test_endpoints.py +++ b/tests/functional/test_endpoints.py @@ -10,7 +10,6 @@ @@ -270,6 +284,8 @@ + assert computed_name == actual_service_name, \ + ("Actual service name `%s` does not match expected service name " + + "we computed: `%s`") % (actual_service_name, computed_name) +Index: b/tests/functional/test_model_backcompat.py +=================================================================== --- a/tests/functional/test_model_backcompat.py +++ b/tests/functional/test_model_backcompat.py @@ -12,7 +12,6 @@ @@ -279,8 +295,8 @@ -from nose.tools import assert_equal from botocore.session import Session from tests import ClientHTTPStubber - -@@ -60,8 +59,7 @@ def test_old_model_continues_to_work(): + from tests.functional import TEST_MODELS_DIR +@@ -56,8 +55,7 @@ def test_old_model_continues_to_work(): 'Content-Type': 'application/x-amz-json-1.1'}, body=b'{"CertificateSummaryList":[]}') response = client.list_certificates() @@ -290,7 +306,7 @@ {'CertificateSummaryList': [], 'ResponseMetadata': { 'HTTPHeaders': { -@@ -73,8 +71,7 @@ def test_old_model_continues_to_work(): +@@ -69,8 +67,7 @@ def test_old_model_continues_to_work(): 'RequestId': 'abcd', 'RetryAttempts': 0} } @@ -301,6 +317,8 @@ - assert_equal(client.waiter_names, ['certificate_validated']) + assert client.can_paginate('list_certificates') + assert client.waiter_names == ['certificate_validated'] +Index: b/tests/functional/test_paginate.py +=================================================================== --- a/tests/functional/test_paginate.py +++ b/tests/functional/test_paginate.py @@ -14,9 +14,7 @@ from __future__ import division @@ -365,6 +383,8 @@ + assert isinstance(encoded, six.string_types) + decoded = TokenDecoder().decode(encoded) + self.assertEqual(decoded, token_dict) +Index: b/tests/functional/test_regions.py +=================================================================== --- a/tests/functional/test_regions.py +++ b/tests/functional/test_regions.py @@ -10,10 +10,9 @@ @@ -516,6 +536,8 @@ stubber.requests[0].url, 'https://s3.not-real.amazonaws.com/' ) +Index: b/tests/functional/test_response_shadowing.py +=================================================================== --- a/tests/functional/test_response_shadowing.py +++ b/tests/functional/test_response_shadowing.py @@ -11,7 +11,6 @@ @@ -548,6 +570,8 @@ - yield _assert_not_shadowed, 'Error', shape + _assert_not_shadowed('ResponseMetadata', shape) + _assert_not_shadowed('Error', shape) +Index: b/tests/functional/test_s3.py +=================================================================== --- a/tests/functional/test_s3.py +++ b/tests/functional/test_s3.py @@ -14,7 +14,6 @@ import re @@ -1582,6 +1606,8 @@ actual = '%s://%s%s' % parts[:3] - assert_equal(actual, expected_url) + assert actual == expected_url +Index: b/tests/functional/test_service_names.py +=================================================================== --- a/tests/functional/test_service_names.py +++ b/tests/functional/test_service_names.py @@ -12,7 +12,6 @@ @@ -1627,6 +1653,8 @@ - yield _assert_name_pattern, service_name + _assert_name_length(service_name) + _assert_name_pattern(service_name) +Index: b/tests/integration/test_ec2.py +=================================================================== --- a/tests/integration/test_ec2.py +++ b/tests/integration/test_ec2.py @@ -13,8 +13,6 @@ @@ -1638,6 +1666,8 @@ import botocore.session from botocore.exceptions import ClientError +Index: b/tests/integration/test_emr.py +=================================================================== --- a/tests/integration/test_emr.py +++ b/tests/integration/test_emr.py @@ -12,8 +12,6 @@ @@ -1658,6 +1688,8 @@ # I consider these integration tests because they're +Index: b/tests/integration/test_s3.py +=================================================================== --- a/tests/integration/test_s3.py +++ b/tests/integration/test_s3.py @@ -22,11 +22,10 @@ import tempfile @@ -1736,6 +1768,8 @@ sigv2_client.list_objects(Bucket=eu_bucket) def test_region_redirects_multiple_requests(self): +Index: b/tests/integration/test_smoke.py +=================================================================== --- a/tests/integration/test_smoke.py +++ b/tests/integration/test_smoke.py @@ -11,17 +11,14 @@ to use and all the services in SMOKE_TES @@ -1779,6 +1813,8 @@ def _make_error_client_call(client, operation_name, kwargs): +Index: b/tests/integration/test_waiters.py +=================================================================== --- a/tests/integration/test_waiters.py +++ b/tests/integration/test_waiters.py @@ -12,14 +12,14 @@ @@ -1798,6 +1834,8 @@ class TestWaiterForDynamoDB(unittest.TestCase): def setUp(self): self.session = botocore.session.get_session() +Index: b/tests/unit/auth/test_sigv4.py +=================================================================== --- a/tests/unit/auth/test_sigv4.py +++ b/tests/unit/auth/test_sigv4.py @@ -18,8 +18,7 @@ AWS provides a test suite for signature @@ -1858,6 +1896,8 @@ if actual != expected: message = "The %s did not match" % part message += "\nACTUAL:%r !=\nEXPECT:%r" % (actual, expected) +Index: b/tests/unit/retries/test_special.py +=================================================================== --- a/tests/unit/retries/test_special.py +++ b/tests/unit/retries/test_special.py @@ -1,9 +1,7 @@ @@ -1871,6 +1911,8 @@ from botocore.awsrequest import AWSResponse from botocore.retries import standard, special +Index: b/tests/unit/retries/test_standard.py +=================================================================== --- a/tests/unit/retries/test_standard.py +++ b/tests/unit/retries/test_standard.py @@ -1,7 +1,6 @@ @@ -1975,6 +2017,8 @@ class TestRetryHandler(unittest.TestCase): +Index: b/tests/unit/test_compat.py +=================================================================== --- a/tests/unit/test_compat.py +++ b/tests/unit/test_compat.py @@ -11,9 +11,7 @@ @@ -2133,6 +2177,8 @@ for tzinfo in options: self.assertIsInstance(tzinfo(), datetime.tzinfo) +Index: b/tests/unit/test_config_provider.py +=================================================================== --- a/tests/unit/test_config_provider.py +++ b/tests/unit/test_config_provider.py @@ -11,8 +11,7 @@ @@ -2176,6 +2222,8 @@ class TestChainProvider(unittest.TestCase): +Index: b/tests/unit/test_eventstream.py +=================================================================== --- a/tests/unit/test_eventstream.py +++ b/tests/unit/test_eventstream.py @@ -12,8 +12,10 @@ @@ -2471,6 +2519,8 @@ + else: + raise AssertionError( + 'Expected exception NoInitialResponseError has not been raised.') +Index: b/tests/unit/test_exceptions.py +=================================================================== --- a/tests/unit/test_exceptions.py +++ b/tests/unit/test_exceptions.py @@ -14,8 +14,6 @@ @@ -2500,6 +2550,8 @@ def test_retry_info_added_when_present(): +Index: b/tests/unit/test_http_client_exception_mapping.py +=================================================================== --- a/tests/unit/test_http_client_exception_mapping.py +++ b/tests/unit/test_http_client_exception_mapping.py @@ -1,4 +1,4 @@ @@ -2530,6 +2582,8 @@ + with self.assertRaises(old_exception): + raise new_exception(endpoint_url=None, proxy_url=None, + error=None) +Index: b/tests/unit/test_http_session.py +=================================================================== --- a/tests/unit/test_http_session.py +++ b/tests/unit/test_http_session.py @@ -1,11 +1,12 @@ @@ -2570,6 +2624,8 @@ def test_aws_connection_classes_are_used(self): session = URLLib3Session() +Index: b/tests/unit/test_model.py +=================================================================== --- a/tests/unit/test_model.py +++ b/tests/unit/test_model.py @@ -2,11 +2,11 @@ from tests import unittest @@ -2608,6 +2664,8 @@ def test_operation_does_not_exist(self): with self.assertRaises(model.OperationNotFoundError): +Index: b/tests/unit/test_parsers.py +=================================================================== --- a/tests/unit/test_parsers.py +++ b/tests/unit/test_parsers.py @@ -14,11 +14,11 @@ from tests import unittest, RawResponse @@ -2658,6 +2716,8 @@ + assert parsed['Error'] == \ + {'Code': '503', 'Message': 'Service Unavailable'} + assert parsed['ResponseMetadata']['HTTPStatusCode'] == 503 +Index: b/tests/unit/test_protocols.py +=================================================================== --- a/tests/unit/test_protocols.py +++ b/tests/unit/test_protocols.py @@ -16,7 +16,7 @@ @@ -2762,6 +2822,8 @@ def _walk_files(): +Index: b/requirements.txt +=================================================================== --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ @@ -2776,6 +2838,8 @@ -docutils>=0.10,<0.16 -behave==1.2.5 -jsonschema==2.5.1 +Index: b/tests/unit/response_parsing/README.rst +=================================================================== --- a/tests/unit/response_parsing/README.rst +++ b/tests/unit/response_parsing/README.rst @@ -16,12 +16,12 @@ response sent from the server for that p @@ -2797,6 +2861,8 @@ pretty-printed to stdout and the tests continue. ----------------- +Index: b/tests/functional/test_credentials.py +=================================================================== --- a/tests/functional/test_credentials.py +++ b/tests/functional/test_credentials.py @@ -15,7 +15,7 @@ import threading @@ -2826,6 +2892,8 @@ session.get_credentials() +Index: b/tests/functional/test_history.py +=================================================================== --- a/tests/functional/test_history.py +++ b/tests/functional/test_history.py @@ -1,6 +1,6 @@ @@ -2849,6 +2917,8 @@ self.assertEqual(source, 'BOTOCORE') +Index: b/tests/functional/test_retry.py +=================================================================== --- a/tests/functional/test_retry.py +++ b/tests/functional/test_retry.py @@ -16,6 +16,7 @@ from tests import BaseSessionTest, mock, @@ -2868,6 +2938,8 @@ ClientError, 'reached max retries: %s' % num_retries): yield self.assertEqual(len(http_stubber.requests), num_responses) +Index: b/tests/functional/test_stub.py +=================================================================== --- a/tests/functional/test_stub.py +++ b/tests/functional/test_stub.py @@ -16,6 +16,7 @@ from tests import unittest @@ -2910,18 +2982,11 @@ self.client.list_objects(Bucket='foo') def test_can_continue_to_call_after_expected_params_fail(self): +Index: b/tests/integration/test_client.py +=================================================================== --- a/tests/integration/test_client.py +++ b/tests/integration/test_client.py -@@ -84,7 +84,7 @@ class TestCreateClients(unittest.TestCas - self.assertTrue(hasattr(client, 'list_buckets')) - - def test_client_raises_exception_invalid_region(self): -- with self.assertRaisesRegexp(ValueError, ('Invalid endpoint')): -+ with six.assertRaisesRegex(self, ValueError, ('Invalid endpoint')): - self.session.create_client( - 'cloudformation', region_name='invalid region name') - -@@ -96,8 +96,8 @@ class TestClientErrors(unittest.TestCase +@@ -79,8 +79,8 @@ class TestClientErrors(unittest.TestCase def test_region_mentioned_in_invalid_region(self): client = self.session.create_client( 'cloudformation', region_name='us-east-999') @@ -2932,6 +2997,8 @@ client.list_stacks() def test_client_modeled_exception(self): +Index: b/tests/integration/test_sts.py +=================================================================== --- a/tests/integration/test_sts.py +++ b/tests/integration/test_sts.py @@ -13,6 +13,8 @@ @@ -2950,6 +3017,8 @@ - with self.assertRaisesRegexp(ClientError, 'ap-southeast-1') as e: + with six.assertRaisesRegex(self, ClientError, 'ap-southeast-1'): sts.get_session_token() +Index: b/tests/unit/docs/test_utils.py +=================================================================== --- a/tests/unit/docs/test_utils.py +++ b/tests/unit/docs/test_utils.py @@ -223,5 +223,5 @@ class TestAppendParamDocumentation(BaseD @@ -2959,6 +3028,8 @@ - self.assertEquals(escaped, '\\na\\rb\\tc\\fd\\be') + self.assertEqual(escaped, '\\na\\rb\\tc\\fd\\be') +Index: b/tests/unit/response_parsing/test_response_parsing.py +=================================================================== --- a/tests/unit/response_parsing/test_response_parsing.py +++ b/tests/unit/response_parsing/test_response_parsing.py @@ -119,8 +119,8 @@ def test_xml_parsing(): @@ -2983,6 +3054,8 @@ def _uhg_test_json_parsing(): +Index: b/tests/unit/test_awsrequest.py +=================================================================== --- a/tests/unit/test_awsrequest.py +++ b/tests/unit/test_awsrequest.py @@ -18,13 +18,15 @@ import tempfile @@ -3018,6 +3091,8 @@ class TestAWSHTTPConnection(unittest.TestCase): +Index: b/tests/unit/test_client.py +=================================================================== --- a/tests/unit/test_client.py +++ b/tests/unit/test_client.py @@ -12,7 +12,7 @@ @@ -3074,6 +3149,8 @@ def test_validates_max_retry_attempts(self): with self.assertRaises(InvalidMaxRetryAttemptsError): +Index: b/tests/unit/test_credentials.py +=================================================================== --- a/tests/unit/test_credentials.py +++ b/tests/unit/test_credentials.py @@ -13,7 +13,7 @@ @@ -3175,6 +3252,8 @@ provider.load() def test_missing_session_token(self): +Index: b/tests/unit/test_errorfactory.py +=================================================================== --- a/tests/unit/test_errorfactory.py +++ b/tests/unit/test_errorfactory.py @@ -12,6 +12,7 @@ @@ -3194,6 +3273,8 @@ AttributeError, 'Valid exceptions are: MyException'): self.exceptions.SomeUnmodeledError +Index: b/tests/unit/test_handlers.py +=================================================================== --- a/tests/unit/test_handlers.py +++ b/tests/unit/test_handlers.py @@ -14,7 +14,7 @@ @@ -3214,6 +3295,8 @@ handlers.handle_copy_source_param( {'CopySource': {'Bucket': 'foo'}}) +Index: b/tests/unit/test_loaders.py +=================================================================== --- a/tests/unit/test_loaders.py +++ b/tests/unit/test_loaders.py @@ -22,12 +22,13 @@ @@ -3253,6 +3336,8 @@ loader.load_service_model( 'BAZ', type_name=provided_type_name) +Index: b/tests/unit/test_paginate.py +=================================================================== --- a/tests/unit/test_paginate.py +++ b/tests/unit/test_paginate.py @@ -20,7 +20,7 @@ from botocore.paginate import TokenEncod @@ -3273,6 +3358,8 @@ pagination_config = {'StartingToken': 'does___not___work'} self.paginator.paginate( PaginationConfig=pagination_config).build_full_result() +Index: b/tests/unit/test_s3_addressing.py +=================================================================== --- a/tests/unit/test_s3_addressing.py +++ b/tests/unit/test_s3_addressing.py @@ -16,9 +16,13 @@ @@ -3294,11 +3381,13 @@ 'https://s3.us-west-2.amazonaws.com/192.168.5.256/mykeyname') def test_invalid_endpoint_raises_exception(self): -- with self.assertRaisesRegexp(ValueError, 'Invalid endpoint'): -+ with six.assertRaisesRegex(self, ValueError, 'Invalid endpoint'): +- with self.assertRaisesRegexp(ValueError, 'Invalid region'): ++ with six.assertRaisesRegex(self, ValueError, 'Invalid region'): self.session.create_client('s3', 'Invalid region') def test_non_existent_region(self): +Index: b/tests/unit/test_utils.py +=================================================================== --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -15,7 +15,7 @@ from tests import RawResponse @@ -3319,6 +3408,8 @@ fetcher.retrieve_full_uri(full_uri) self.assertFalse(self.http.send.called) +Index: b/tests/unit/test_waiters.py +=================================================================== --- a/tests/unit/test_waiters.py +++ b/tests/unit/test_waiters.py @@ -13,7 +13,7 @@ @@ -3339,6 +3430,8 @@ waiter.wait() def test_waiter_transitions_to_failure_state(self): +Index: b/tests/functional/docs/test_shared_example_config.py +=================================================================== --- a/tests/functional/docs/test_shared_example_config.py +++ b/tests/functional/docs/test_shared_example_config.py @@ -27,7 +27,7 @@ def test_lint_shared_example_configs(): @@ -3350,6 +3443,8 @@ def _lint_single_example(operation_name, example_config, service_model): +Index: b/tests/functional/test_alias.py +=================================================================== --- a/tests/functional/test_alias.py +++ b/tests/functional/test_alias.py @@ -49,13 +49,13 @@ ALIAS_CASES = [ @@ -3368,6 +3463,8 @@ def _can_use_parameter_in_client_call(session, case, use_alias=True): +Index: b/tests/functional/test_event_alias.py +=================================================================== --- a/tests/functional/test_event_alias.py +++ b/tests/functional/test_event_alias.py @@ -584,8 +584,8 @@ def test_event_alias(): @@ -3381,6 +3478,8 @@ def _assert_handler_called(client_name, event_part): +Index: b/tests/functional/test_h2_required.py +=================================================================== --- a/tests/functional/test_h2_required.py +++ b/tests/functional/test_h2_required.py @@ -29,12 +29,12 @@ def test_all_uses_of_h2_are_known(): @@ -3398,6 +3497,8 @@ def _assert_h2_service_is_known(service): +Index: b/tests/functional/test_model_completeness.py +=================================================================== --- a/tests/functional/test_model_completeness.py +++ b/tests/functional/test_model_completeness.py @@ -38,5 +38,6 @@ def test_paginators_and_waiters_are_not_ @@ -3409,6 +3510,8 @@ + _test_model_is_not_lost(service_name, + type_name, + versions[-2], versions[-1]) +Index: b/tests/functional/test_paginator_config.py +=================================================================== --- a/tests/functional/test_paginator_config.py +++ b/tests/functional/test_paginator_config.py @@ -140,12 +140,7 @@ def test_lint_pagination_configs(): @@ -3425,6 +3528,8 @@ def _lint_single_paginator(operation_name, page_config, +Index: b/tests/functional/test_public_apis.py +=================================================================== --- a/tests/functional/test_public_apis.py +++ b/tests/functional/test_public_apis.py @@ -12,7 +12,7 @@ @@ -3442,6 +3547,8 @@ method = getattr(client, xform_name(operation_name)) - yield _test_public_apis_will_not_be_signed, client, method, kwargs + _test_public_apis_will_not_be_signed(client, method, kwargs) +Index: b/tests/functional/test_service_alias.py +=================================================================== --- a/tests/functional/test_service_alias.py +++ b/tests/functional/test_service_alias.py @@ -17,7 +17,7 @@ from botocore.handlers import SERVICE_NA @@ -3453,6 +3560,8 @@ def _instantiates_the_same_client(session, service_name, service_alias): +Index: b/tests/functional/test_six_imports.py +=================================================================== --- a/tests/functional/test_six_imports.py +++ b/tests/functional/test_six_imports.py @@ -15,7 +15,7 @@ def test_no_bare_six_imports(): @@ -3464,6 +3573,8 @@ def _assert_no_bare_six_imports(filename): +Index: b/tests/functional/test_waiter_config.py +=================================================================== --- a/tests/functional/test_waiter_config.py +++ b/tests/functional/test_waiter_config.py @@ -98,9 +98,9 @@ def test_lint_waiter_configs(): @@ -3478,6 +3589,8 @@ def _lint_single_waiter(client, waiter_name, service_model): +Index: b/tests/functional/test_apigateway.py +=================================================================== --- a/tests/functional/test_apigateway.py +++ b/tests/functional/test_apigateway.py @@ -10,7 +10,7 @@ @@ -3489,6 +3602,8 @@ from tests import BaseSessionTest, ClientHTTPStubber +Index: b/tests/functional/test_cloudsearchdomain.py +=================================================================== --- a/tests/functional/test_cloudsearchdomain.py +++ b/tests/functional/test_cloudsearchdomain.py @@ -10,7 +10,7 @@ @@ -3500,6 +3615,8 @@ from tests import BaseSessionTest, ClientHTTPStubber +Index: b/tests/functional/test_docdb.py +=================================================================== --- a/tests/functional/test_docdb.py +++ b/tests/functional/test_docdb.py @@ -10,7 +10,7 @@ @@ -3511,6 +3628,8 @@ from contextlib import contextmanager import botocore.session +Index: b/tests/functional/test_ec2.py +=================================================================== --- a/tests/functional/test_ec2.py +++ b/tests/functional/test_ec2.py @@ -11,7 +11,7 @@ @@ -3522,6 +3641,8 @@ from tests import unittest, ClientHTTPStubber, BaseSessionTest from botocore.compat import parse_qs, urlparse +Index: b/tests/functional/test_lex.py +=================================================================== --- a/tests/functional/test_lex.py +++ b/tests/functional/test_lex.py @@ -10,7 +10,7 @@ @@ -3533,6 +3654,8 @@ from datetime import datetime from tests import BaseSessionTest, ClientHTTPStubber +Index: b/tests/functional/test_machinelearning.py +=================================================================== --- a/tests/functional/test_machinelearning.py +++ b/tests/functional/test_machinelearning.py @@ -10,7 +10,7 @@ @@ -3544,6 +3667,8 @@ from tests import BaseSessionTest, ClientHTTPStubber +Index: b/tests/functional/test_neptune.py +=================================================================== --- a/tests/functional/test_neptune.py +++ b/tests/functional/test_neptune.py @@ -10,7 +10,7 @@ @@ -3555,6 +3680,8 @@ from contextlib import contextmanager import botocore.session +Index: b/tests/functional/test_rds.py +=================================================================== --- a/tests/functional/test_rds.py +++ b/tests/functional/test_rds.py @@ -10,7 +10,7 @@ @@ -3566,6 +3693,8 @@ from contextlib import contextmanager import botocore.session +Index: b/tests/functional/test_session.py +=================================================================== --- a/tests/functional/test_session.py +++ b/tests/functional/test_session.py @@ -12,7 +12,7 @@ @@ -3577,6 +3706,8 @@ import botocore.session from botocore.exceptions import ProfileNotFound +Index: b/tests/functional/test_sts.py +=================================================================== --- a/tests/functional/test_sts.py +++ b/tests/functional/test_sts.py @@ -13,7 +13,7 @@ @@ -3588,6 +3719,8 @@ from tests import BaseSessionTest from tests import temporary_file +Index: b/tests/integration/test_credentials.py +=================================================================== --- a/tests/integration/test_credentials.py +++ b/tests/integration/test_credentials.py @@ -11,7 +11,7 @@ @@ -3599,6 +3732,8 @@ import tempfile import shutil import json +Index: b/tests/integration/test_loaders.py +=================================================================== --- a/tests/integration/test_loaders.py +++ b/tests/integration/test_loaders.py @@ -13,7 +13,7 @@ @@ -3610,6 +3745,8 @@ import botocore.session +Index: b/tests/unit/auth/test_signers.py +=================================================================== --- a/tests/unit/auth/test_signers.py +++ b/tests/unit/auth/test_signers.py @@ -18,7 +18,7 @@ import time @@ -3621,6 +3758,8 @@ import botocore.auth import botocore.credentials +Index: b/tests/unit/docs/__init__.py +=================================================================== --- a/tests/unit/docs/__init__.py +++ b/tests/unit/docs/__init__.py @@ -16,7 +16,7 @@ import tempfile @@ -3632,6 +3771,8 @@ from tests import unittest from botocore.compat import OrderedDict +Index: b/tests/unit/docs/bcdoc/test_docstringparser.py +=================================================================== --- a/tests/unit/docs/bcdoc/test_docstringparser.py +++ b/tests/unit/docs/bcdoc/test_docstringparser.py @@ -18,7 +18,7 @@ @@ -3643,6 +3784,8 @@ from tests import unittest import botocore.docs.bcdoc.docstringparser as parser +Index: b/tests/unit/docs/test_docs.py +=================================================================== --- a/tests/unit/docs/test_docs.py +++ b/tests/unit/docs/test_docs.py @@ -14,7 +14,7 @@ import os @@ -3654,6 +3797,8 @@ from tests.unit.docs import BaseDocsTest from botocore.session import get_session +Index: b/tests/unit/docs/test_example.py +=================================================================== --- a/tests/unit/docs/test_example.py +++ b/tests/unit/docs/test_example.py @@ -10,7 +10,7 @@ @@ -3665,6 +3810,8 @@ from tests.unit.docs import BaseDocsTest from botocore.hooks import HierarchicalEmitter +Index: b/tests/unit/docs/test_params.py +=================================================================== --- a/tests/unit/docs/test_params.py +++ b/tests/unit/docs/test_params.py @@ -10,7 +10,7 @@ @@ -3676,6 +3823,8 @@ from tests.unit.docs import BaseDocsTest from botocore.hooks import HierarchicalEmitter +Index: b/tests/unit/docs/test_service.py +=================================================================== --- a/tests/unit/docs/test_service.py +++ b/tests/unit/docs/test_service.py @@ -12,7 +12,7 @@ @@ -3687,6 +3836,8 @@ from tests.unit.docs import BaseDocsTest from botocore.session import get_session +Index: b/tests/unit/retries/test_adaptive.py +=================================================================== --- a/tests/unit/retries/test_adaptive.py +++ b/tests/unit/retries/test_adaptive.py @@ -1,6 +1,6 @@ @@ -3697,6 +3848,8 @@ from botocore.retries import adaptive from botocore.retries import standard +Index: b/tests/unit/test_args.py +=================================================================== --- a/tests/unit/test_args.py +++ b/tests/unit/test_args.py @@ -15,7 +15,7 @@ import socket @@ -3708,6 +3861,8 @@ from botocore import args from botocore import exceptions +Index: b/tests/unit/test_configloader.py +=================================================================== --- a/tests/unit/test_configloader.py +++ b/tests/unit/test_configloader.py @@ -14,7 +14,7 @@ @@ -3719,6 +3874,8 @@ import tempfile import shutil +Index: b/tests/unit/test_history.py +=================================================================== --- a/tests/unit/test_history.py +++ b/tests/unit/test_history.py @@ -1,6 +1,6 @@ @@ -3729,6 +3886,8 @@ from botocore.history import HistoryRecorder from botocore.history import BaseHistoryHandler +Index: b/tests/unit/test_idempotency.py +=================================================================== --- a/tests/unit/test_idempotency.py +++ b/tests/unit/test_idempotency.py @@ -13,7 +13,7 @@ @@ -3740,6 +3899,8 @@ from botocore.handlers import generate_idempotent_uuid +Index: b/tests/unit/test_retryhandler.py +=================================================================== --- a/tests/unit/test_retryhandler.py +++ b/tests/unit/test_retryhandler.py @@ -15,7 +15,7 @@ @@ -3751,6 +3912,8 @@ from botocore import retryhandler from botocore.exceptions import ( +Index: b/tests/unit/test_session.py +=================================================================== --- a/tests/unit/test_session.py +++ b/tests/unit/test_session.py @@ -19,7 +19,7 @@ import logging @@ -3762,6 +3925,8 @@ import botocore.session import botocore.exceptions +Index: b/tests/unit/test_session_legacy.py +=================================================================== --- a/tests/unit/test_session_legacy.py +++ b/tests/unit/test_session_legacy.py @@ -19,7 +19,7 @@ import logging @@ -3773,6 +3938,8 @@ import botocore.session import botocore.exceptions +Index: b/tests/unit/test_signers.py +=================================================================== --- a/tests/unit/test_signers.py +++ b/tests/unit/test_signers.py @@ -10,7 +10,7 @@ @@ -3784,6 +3951,8 @@ import datetime import json +Index: b/tests/unit/test_stub.py +=================================================================== --- a/tests/unit/test_stub.py +++ b/tests/unit/test_stub.py @@ -12,7 +12,7 @@ @@ -3795,6 +3964,8 @@ from botocore.stub import Stubber from botocore.exceptions import ParamValidationError, StubResponseError, UnStubbedResponseError +Index: b/tests/unit/test_discovery.py +=================================================================== --- a/tests/unit/test_discovery.py +++ b/tests/unit/test_discovery.py @@ -1,5 +1,8 @@ @@ -3807,6 +3978,8 @@ from tests import unittest from botocore.awsrequest import AWSRequest +Index: b/tests/unit/test_endpoint.py +=================================================================== --- a/tests/unit/test_endpoint.py +++ b/tests/unit/test_endpoint.py @@ -13,7 +13,10 @@