[Python-modules-commits] [awscli] 01/01: Adopt to botocore changes.

[Takaki Taniguchi]

This is an automated email from the git hooks/post-receive script.

takaki pushed a commit to branch patch-queue/master
in repository awscli.

commit 85f89234eb320b2db1a2e2ffb29e5d565e9e2525
Author: TANIGUCHI Takaki <takaki at debian.org>
Date:   Sat Feb 3 22:10:01 2018 +0900

    Adopt to botocore changes.
    
    botocore is changed to remove duplicated code. So import path have to be changed.
    
    awscli (1.2.9-1) unstable; urgency=low
    
      * Initial release (Closes: #733211)
    Bug-Debian: http://bugs.debian.org/733211
    
    Gbp-Pq: Name adopt_to_botocore_changes
---
 awscli/customizations/awslambda.py          | 2 +-
 awscli/customizations/configure/__init__.py | 2 +-
 awscli/paramfile.py                         | 2 +-
 awscli/testutils.py                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/awscli/customizations/awslambda.py b/awscli/customizations/awslambda.py
index 03fff2b..6733b26 100644
--- a/awscli/customizations/awslambda.py
+++ b/awscli/customizations/awslambda.py
@@ -14,7 +14,7 @@ import zipfile
 import copy
 from contextlib import closing
 
-from botocore.vendored import six
+import six
 
 from awscli.arguments import CustomArgument, CLIArgument
 from awscli.customizations import utils
diff --git a/awscli/customizations/configure/__init__.py b/awscli/customizations/configure/__init__.py
index ea49773..61331bd 100644
--- a/awscli/customizations/configure/__init__.py
+++ b/awscli/customizations/configure/__init__.py
@@ -11,7 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 import string
-from botocore.vendored.six.moves import shlex_quote
+from six.moves import shlex_quote
 
 NOT_SET = '<not set>'
 PREDEFINED_SECTION_NAMES = ('preview', 'plugins')
diff --git a/awscli/paramfile.py b/awscli/paramfile.py
index fdea57b..2321367 100644
--- a/awscli/paramfile.py
+++ b/awscli/paramfile.py
@@ -13,7 +13,7 @@
 import logging
 import os
 
-from botocore.vendored import requests
+import requests
 from awscli.compat import six
 
 from awscli.compat import compat_open
diff --git a/awscli/testutils.py b/awscli/testutils.py
index 296efea..eb7d3f1 100644
--- a/awscli/testutils.py
+++ b/awscli/testutils.py
@@ -52,7 +52,7 @@ from botocore.session import Session
 from botocore.exceptions import ClientError
 from botocore.exceptions import WaiterError
 import botocore.loaders
-from botocore.vendored import requests
+import requests
 
 import awscli.clidriver
 from awscli.plugin import load_plugins

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/awscli.git