1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
|
From 9c646b991cffe67a2de513866b915439e08d907a Mon Sep 17 00:00:00 2001
From: TANIGUCHI Takaki <takaki@asis.media-as.org>
Date: Tue, 24 Nov 2015 20:40:16 +0900
Subject: Don't use duplicated modules
fix path
---
botocore/awsrequest.py | 12 ++++++------
botocore/compat.py | 4 ++--
botocore/endpoint.py | 14 +++++++-------
botocore/exceptions.py | 2 +-
botocore/retryhandler.py | 4 ++--
botocore/stub.py | 2 +-
botocore/utils.py | 2 +-
7 files changed, 20 insertions(+), 20 deletions(-)
Index: python-botocore/botocore/awsrequest.py
===================================================================
--- python-botocore.orig/botocore/awsrequest.py 2016-11-10 11:30:23.478805141 +0900
+++ python-botocore/botocore/awsrequest.py 2016-11-10 11:30:23.466805008 +0900
@@ -22,15 +22,15 @@
from botocore.compat import HTTPHeaders, HTTPResponse, urlunsplit, urlsplit
from botocore.exceptions import UnseekableStreamError
from botocore.utils import percent_encode_sequence
-from botocore.vendored.requests import models
-from botocore.vendored.requests.sessions import REDIRECT_STATI
-from botocore.vendored.requests.packages.urllib3.connection import \
+from requests import models
+from requests.sessions import REDIRECT_STATI
+from urllib3.connection import \
VerifiedHTTPSConnection
-from botocore.vendored.requests.packages.urllib3.connection import \
+from urllib3.connection import \
HTTPConnection
-from botocore.vendored.requests.packages.urllib3.connectionpool import \
+from urllib3.connectionpool import \
HTTPConnectionPool
-from botocore.vendored.requests.packages.urllib3.connectionpool import \
+from urllib3.connectionpool import \
HTTPSConnectionPool
Index: python-botocore/botocore/compat.py
===================================================================
--- python-botocore.orig/botocore/compat.py 2016-11-10 11:30:23.478805141 +0900
+++ python-botocore/botocore/compat.py 2016-11-10 11:30:23.466805008 +0900
@@ -19,9 +19,9 @@
import hashlib
import logging
-from botocore.vendored import six
+import six
from botocore.exceptions import MD5UnavailableError
-from botocore.vendored.requests.packages.urllib3 import exceptions
+from urllib3 import exceptions
logger = logging.getLogger(__name__)
Index: python-botocore/botocore/endpoint.py
===================================================================
--- python-botocore.orig/botocore/endpoint.py 2016-11-10 11:30:23.478805141 +0900
+++ python-botocore/botocore/endpoint.py 2016-11-10 11:30:23.466805008 +0900
@@ -17,11 +17,11 @@
import time
import threading
-from botocore.vendored.requests.adapters import HTTPAdapter
-from botocore.vendored.requests.sessions import Session
-from botocore.vendored.requests.utils import get_environ_proxies
-from botocore.vendored.requests.exceptions import ConnectionError
-from botocore.vendored import six
+from requests.adapters import HTTPAdapter
+from requests.sessions import Session
+from requests.utils import get_environ_proxies
+from requests.exceptions import ConnectionError
+import six
from botocore.awsrequest import create_request_object
from botocore.exceptions import UnknownEndpointError
@@ -40,7 +40,7 @@
filter_ssl_warnings()
try:
- from botocore.vendored.requests.packages.urllib3.contrib import pyopenssl
+ from urllib3.contrib import pyopenssl
pyopenssl.extract_from_urllib3()
except ImportError:
pass
@@ -52,7 +52,7 @@
This converts the requests library's HTTP response object to
a dictionary.
- :type http_response: botocore.vendored.requests.model.Response
+ :type http_response: requests.model.Response
:param http_response: The HTTP response from an AWS service request.
:rtype: dict
Index: python-botocore/botocore/exceptions.py
===================================================================
--- python-botocore.orig/botocore/exceptions.py 2016-11-10 11:30:23.478805141 +0900
+++ python-botocore/botocore/exceptions.py 2016-11-10 11:30:23.466805008 +0900
@@ -12,7 +12,7 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
from __future__ import unicode_literals
-from botocore.vendored.requests.exceptions import ConnectionError
+from requests.exceptions import ConnectionError
class BotoCoreError(Exception):
Index: python-botocore/botocore/retryhandler.py
===================================================================
--- python-botocore.orig/botocore/retryhandler.py 2016-11-10 11:30:23.478805141 +0900
+++ python-botocore/botocore/retryhandler.py 2016-11-10 11:30:23.466805008 +0900
@@ -17,8 +17,8 @@
import logging
from binascii import crc32
-from botocore.vendored.requests import ConnectionError, Timeout
-from botocore.vendored.requests.packages.urllib3.exceptions import ClosedPoolError
+from requests import ConnectionError, Timeout
+from urllib3.exceptions import ClosedPoolError
from botocore.exceptions import ChecksumError, EndpointConnectionError
Index: python-botocore/botocore/stub.py
===================================================================
--- python-botocore.orig/botocore/stub.py 2016-11-10 11:30:23.478805141 +0900
+++ python-botocore/botocore/stub.py 2016-11-10 11:30:23.466805008 +0900
@@ -17,7 +17,7 @@
from botocore.validate import validate_parameters
from botocore.exceptions import ParamValidationError, \
StubResponseError, StubAssertionError
-from botocore.vendored.requests.models import Response
+from requests.models import Response
class _ANY(object):
Index: python-botocore/botocore/utils.py
===================================================================
--- python-botocore.orig/botocore/utils.py 2016-11-10 11:30:23.478805141 +0900
+++ python-botocore/botocore/utils.py 2016-11-10 11:30:23.466805008 +0900
@@ -28,7 +28,7 @@
from botocore.exceptions import InvalidDNSNameError, ClientError
from botocore.exceptions import MetadataRetrievalError
from botocore.compat import json, quote, zip_longest, urlsplit, urlunsplit
-from botocore.vendored import requests
+import requests
from botocore.compat import OrderedDict
|
