Refresh patches

debian/patches/0001-Don-t-use-duplicated-modules.patch

@@ -13,11 +13,9 @@ fix path
  botocore/utils.py        |  2 +-
  7 files changed, 21 insertions(+), 21 deletions(-)
 
-diff --git a/botocore/awsrequest.py b/botocore/awsrequest.py
-index c26ebc0..f1083af 100644
 --- a/botocore/awsrequest.py
 +++ b/botocore/awsrequest.py
-@@ -23,15 +23,15 @@ from botocore.compat import HTTPHeaders, HTTPResponse, urlunsplit, urlsplit,\
+@@ -23,15 +23,15 @@ from botocore.compat import HTTPHeaders,
      urlparse
  from botocore.exceptions import UnseekableStreamError
  from botocore.utils import percent_encode_sequence
@@ -39,13 +37,11 @@ index c26ebc0..f1083af 100644
      HTTPSConnectionPool
  
  
-diff --git a/botocore/compat.py b/botocore/compat.py
-index 0180df4..980de8d 100644
 --- a/botocore/compat.py
 +++ b/botocore/compat.py
-@@ -19,15 +19,15 @@ import warnings
- import hashlib
- import logging
+@@ -21,15 +21,15 @@ import logging
+ import shlex
+ from math import floor
  
 -from botocore.vendored import six
 +import six
@@ -62,8 +58,6 @@ index 0180df4..980de8d 100644
  
      class HTTPHeaders(http_client.HTTPMessage):
          pass
-diff --git a/botocore/endpoint.py b/botocore/endpoint.py
-index 64ccfbd..1dc21fe 100644
 --- a/botocore/endpoint.py
 +++ b/botocore/endpoint.py
 @@ -17,11 +17,11 @@ import logging
@@ -83,7 +77,7 @@ index 64ccfbd..1dc21fe 100644
  
  from botocore.awsrequest import create_request_object
  from botocore.exceptions import UnknownEndpointError
-@@ -40,7 +40,7 @@ MAX_POOL_CONNECTIONS = 10
+@@ -42,7 +42,7 @@ MAX_POOL_CONNECTIONS = 10
  filter_ssl_warnings()
  
  try:
@@ -92,7 +86,7 @@ index 64ccfbd..1dc21fe 100644
      pyopenssl.extract_from_urllib3()
  except ImportError:
      pass
-@@ -52,7 +52,7 @@ def convert_to_response_dict(http_response, operation_model):
+@@ -54,7 +54,7 @@ def convert_to_response_dict(http_respon
      This converts the requests library's HTTP response object to
      a dictionary.
  
@@ -101,8 +95,6 @@ index 64ccfbd..1dc21fe 100644
      :param http_response: The HTTP response from an AWS service request.
  
      :rtype: dict
-diff --git a/botocore/exceptions.py b/botocore/exceptions.py
-index d28b3bb..9ef7a72 100644
 --- a/botocore/exceptions.py
 +++ b/botocore/exceptions.py
 @@ -12,7 +12,7 @@
@@ -114,8 +106,6 @@ index d28b3bb..9ef7a72 100644
  
  
  class BotoCoreError(Exception):
-diff --git a/botocore/retryhandler.py b/botocore/retryhandler.py
-index 09b59e5..58913ec 100644
 --- a/botocore/retryhandler.py
 +++ b/botocore/retryhandler.py
 @@ -17,8 +17,8 @@ import functools
@@ -129,24 +119,20 @@ index 09b59e5..58913ec 100644
  
  from botocore.exceptions import ChecksumError, EndpointConnectionError
  
-diff --git a/botocore/stub.py b/botocore/stub.py
-index 85f8f9e..5432d0b 100644
 --- a/botocore/stub.py
 +++ b/botocore/stub.py
 @@ -17,7 +17,7 @@ from pprint import pformat
  from botocore.validate import validate_parameters
  from botocore.exceptions import ParamValidationError, \
-     StubResponseError, StubAssertionError
+     StubResponseError, StubAssertionError, UnStubbedResponseError
 -from botocore.vendored.requests.models import Response
 +from requests.models import Response
  
  
  class _ANY(object):
-diff --git a/botocore/utils.py b/botocore/utils.py
-index 59cf349..59d76fa 100644
 --- a/botocore/utils.py
 +++ b/botocore/utils.py
-@@ -28,7 +28,7 @@ from botocore.exceptions import InvalidExpressionError, ConfigNotFound
+@@ -28,7 +28,7 @@ from botocore.exceptions import InvalidE
  from botocore.exceptions import InvalidDNSNameError, ClientError
  from botocore.exceptions import MetadataRetrievalError
  from botocore.compat import json, quote, zip_longest, urlsplit, urlunsplit