refresh patch
This commit is contained in:
parent
8d5dcc82b8
commit
6eb10eb5e6
78
debian/patches/remove-duplicated-code
vendored
78
debian/patches/remove-duplicated-code
vendored
|
@ -20,33 +20,11 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
|
||||||
Reviewed-By: <name and email of someone who approved the patch>
|
Reviewed-By: <name and email of someone who approved the patch>
|
||||||
Last-Update: <YYYY-MM-DD>
|
Last-Update: <YYYY-MM-DD>
|
||||||
|
|
||||||
--- python-botocore-0.29.0+repack.orig/botocore/awsrequest.py
|
Index: python-botocore-0.52.0/botocore/endpoint.py
|
||||||
+++ python-botocore-0.29.0+repack/botocore/awsrequest.py
|
===================================================================
|
||||||
@@ -23,8 +23,8 @@
|
--- python-botocore-0.52.0.orig/botocore/endpoint.py 2014-06-22 19:12:55.888338509 +0900
|
||||||
import logging
|
+++ python-botocore-0.52.0/botocore/endpoint.py 2014-06-22 19:12:55.884338571 +0900
|
||||||
|
@@ -17,8 +17,8 @@
|
||||||
import six
|
|
||||||
-from botocore.vendored.requests import models
|
|
||||||
-from botocore.vendored.requests.sessions import REDIRECT_STATI
|
|
||||||
+from requests import models
|
|
||||||
+from requests.sessions import REDIRECT_STATI
|
|
||||||
|
|
||||||
from botocore.compat import HTTPHeaders, file_type
|
|
||||||
from botocore.exceptions import UnseekableStreamError
|
|
||||||
--- python-botocore-0.29.0+repack.orig/botocore/credentials.py
|
|
||||||
+++ python-botocore-0.29.0+repack/botocore/credentials.py
|
|
||||||
@@ -21,7 +21,7 @@
|
|
||||||
# IN THE SOFTWARE.
|
|
||||||
#
|
|
||||||
import os
|
|
||||||
-from botocore.vendored import requests
|
|
||||||
+import requests
|
|
||||||
import logging
|
|
||||||
|
|
||||||
from six.moves import configparser
|
|
||||||
--- python-botocore-0.29.0+repack.orig/botocore/endpoint.py
|
|
||||||
+++ python-botocore-0.29.0+repack/botocore/endpoint.py
|
|
||||||
@@ -25,8 +25,8 @@ import logging
|
|
||||||
import time
|
import time
|
||||||
import threading
|
import threading
|
||||||
|
|
||||||
|
@ -57,9 +35,11 @@ Last-Update: <YYYY-MM-DD>
|
||||||
import six
|
import six
|
||||||
|
|
||||||
import botocore.response
|
import botocore.response
|
||||||
--- python-botocore-0.29.0+repack.orig/botocore/retryhandler.py
|
Index: python-botocore-0.52.0/botocore/retryhandler.py
|
||||||
+++ python-botocore-0.29.0+repack/botocore/retryhandler.py
|
===================================================================
|
||||||
@@ -25,8 +25,8 @@ import functools
|
--- python-botocore-0.52.0.orig/botocore/retryhandler.py 2014-06-22 19:12:55.888338509 +0900
|
||||||
|
+++ python-botocore-0.52.0/botocore/retryhandler.py 2014-06-22 19:12:55.884338571 +0900
|
||||||
|
@@ -17,8 +17,8 @@
|
||||||
import logging
|
import logging
|
||||||
from binascii import crc32
|
from binascii import crc32
|
||||||
|
|
||||||
|
@ -70,3 +50,41 @@ Last-Update: <YYYY-MM-DD>
|
||||||
|
|
||||||
from botocore.exceptions import ChecksumError
|
from botocore.exceptions import ChecksumError
|
||||||
|
|
||||||
|
Index: python-botocore-0.52.0/botocore/awsrequest.py
|
||||||
|
===================================================================
|
||||||
|
--- python-botocore-0.52.0.orig/botocore/awsrequest.py 2014-06-22 19:12:55.888338509 +0900
|
||||||
|
+++ python-botocore-0.52.0/botocore/awsrequest.py 2014-06-22 19:13:52.571480844 +0900
|
||||||
|
@@ -17,14 +17,14 @@
|
||||||
|
import inspect
|
||||||
|
|
||||||
|
import six
|
||||||
|
-from botocore.vendored.requests import models
|
||||||
|
-from botocore.vendored.requests.sessions import REDIRECT_STATI
|
||||||
|
+from requests import models
|
||||||
|
+from requests.sessions import REDIRECT_STATI
|
||||||
|
from botocore.compat import HTTPHeaders, file_type, HTTPResponse
|
||||||
|
from botocore.exceptions import UnseekableStreamError
|
||||||
|
-from botocore.vendored.requests.packages.urllib3.connection import VerifiedHTTPSConnection
|
||||||
|
-from botocore.vendored.requests.packages.urllib3.connection import HTTPConnection
|
||||||
|
-from botocore.vendored.requests.packages.urllib3.connectionpool import HTTPConnectionPool
|
||||||
|
-from botocore.vendored.requests.packages.urllib3.connectionpool import HTTPSConnectionPool
|
||||||
|
+from urllib3.connection import VerifiedHTTPSConnection
|
||||||
|
+from urllib3.connection import HTTPConnection
|
||||||
|
+from urllib3.connectionpool import HTTPConnectionPool
|
||||||
|
+from urllib3.connectionpool import HTTPSConnectionPool
|
||||||
|
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
Index: python-botocore-0.52.0/botocore/utils.py
|
||||||
|
===================================================================
|
||||||
|
--- python-botocore-0.52.0.orig/botocore/utils.py 2014-06-20 06:28:15.000000000 +0900
|
||||||
|
+++ python-botocore-0.52.0/botocore/utils.py 2014-06-22 19:15:44.709784035 +0900
|
||||||
|
@@ -15,7 +15,7 @@
|
||||||
|
|
||||||
|
from .exceptions import InvalidExpressionError, ConfigNotFound
|
||||||
|
from .compat import json
|
||||||
|
-from .vendored import requests
|
||||||
|
+import requests
|
||||||
|
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
Loading…
Reference in a new issue