dprevot/python-botocore
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Don't use duplicated modules

Browse source 
fix path
This commit is contained in:
TANIGUCHI Takaki 2015-11-24 20:40:16 +09:00
parent b50932b9a1
commit dea6f47712
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
botocore/awsrequest.py
View file

@ -22,15 +22,15 @@ from botocore.compat import six
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

4
botocore/compat.py
View file

@ -17,8 +17,8 @@ import sys
import inspect
import warnings
from botocore.vendored import six
from botocore.vendored.requests.packages.urllib3 import exceptions
import six
from urllib3 import exceptions
if six.PY3:

10
botocore/endpoint.py
View file

@ -17,10 +17,10 @@ import logging
import time
import threading
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.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 BaseEndpointResolverError
@ -44,7 +44,7 @@ def convert_to_response_dict(http_response, operation_model):
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

2
botocore/exceptions.py
View file

@ -11,7 +11,7 @@
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
from botocore.vendored.requests.exceptions import ConnectionError
from requests.exceptions import ConnectionError
class BotoCoreError(Exception):

4
botocore/retryhandler.py
View file

@ -17,8 +17,8 @@ import functools
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

2
botocore/utils.py
View file

@ -24,7 +24,7 @@ from dateutil.tz import tzlocal, tzutc
from botocore.exceptions import InvalidExpressionError, ConfigNotFound
from botocore.exceptions import InvalidDNSNameError
from botocore.compat import json, quote, zip_longest, urlsplit, urlunsplit
from botocore.vendored import requests
import requests
from botocore.compat import OrderedDict