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

<short summary of the patch>

Browse source 
TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 python-botocore (0.81.0-1) UNRELEASED; urgency=medium
 .
   * New upstream release

Patch-Name: remove-duplicated-code
This commit is contained in:
TANIGUCHI Takaki 2015-10-08 11:16:20 -07:00 committed by SVN-Git Migration
parent fff9a8a8ca
commit 0be67ded0a
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
botocore/awsrequest.py
View file

@ -19,14 +19,14 @@ import socket
import inspect
from botocore.compat 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, 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__)

2
botocore/compat.py
View file

@ -16,7 +16,7 @@ import datetime
import sys
import inspect
from botocore.vendored import six
import six
if six.PY3:

4
botocore/endpoint.py
View file

@ -17,8 +17,8 @@ import logging
import time
import threading
from botocore.vendored.requests.sessions import Session
from botocore.vendored.requests.utils import get_environ_proxies
from requests.sessions import Session
from requests.utils import get_environ_proxies
import botocore.response
import botocore.exceptions

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

2
botocore/utils.py
View file

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