[Python-modules-commits] [awscli] 06/07: refresh patch

[Takaki Taniguchi]

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

takaki pushed a commit to branch master
in repository awscli.

commit e97f52366ba6cc2dea3f6c495cea0134b068bd45
Author: TANIGUCHI Takaki <takaki at asis.media-as.org>
Date:   Sat Feb 3 22:12:06 2018 +0900

    refresh patch
---
 debian/patches/adopt_to_botocore_changes | 90 +++++++++++++++++---------------
 1 file changed, 49 insertions(+), 41 deletions(-)

diff --git a/debian/patches/adopt_to_botocore_changes b/debian/patches/adopt_to_botocore_changes
index 52acf9f..cfd9d5a 100644
--- a/debian/patches/adopt_to_botocore_changes
+++ b/debian/patches/adopt_to_botocore_changes
@@ -1,29 +1,50 @@
-Description: 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)
-Author: TANIGUCHI Takaki <takaki at debian.org>
-Bug-Debian: http://bugs.debian.org/733211
+From: TANIGUCHI Takaki <takaki at debian.org>
+Date: Sat, 3 Feb 2018 22:10:01 +0900
+Subject: Adopt to botocore changes.
 
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
+botocore is changed to remove duplicated code. So import path have to be changed.
+
+awscli (1.2.9-1) unstable; urgency=low
 
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
+  * Initial release (Closes: #733211)
+Bug-Debian: http://bugs.debian.org/733211
+---
+ 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(-)
 
-Index: awscli/awscli/paramfile.py
-===================================================================
---- awscli.orig/awscli/paramfile.py	2017-07-04 16:23:41.649849020 +0900
-+++ awscli/awscli/paramfile.py	2017-07-04 16:23:41.645849073 +0900
+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
@@ -33,11 +54,11 @@ Index: awscli/awscli/paramfile.py
  from awscli.compat import six
  
  from awscli.compat import compat_open
-Index: awscli/awscli/testutils.py
-===================================================================
---- awscli.orig/awscli/testutils.py	2017-07-04 16:23:41.649849020 +0900
-+++ awscli/awscli/testutils.py	2017-07-04 16:23:41.645849073 +0900
-@@ -52,7 +52,7 @@
+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
@@ -46,16 +67,3 @@ Index: awscli/awscli/testutils.py
  
  import awscli.clidriver
  from awscli.plugin import load_plugins
-Index: awscli/awscli/customizations/awslambda.py
-===================================================================
---- awscli.orig/awscli/customizations/awslambda.py	2017-07-04 16:23:41.649849020 +0900
-+++ awscli/awscli/customizations/awslambda.py	2017-07-04 16:23:41.645849073 +0900
-@@ -14,7 +14,7 @@
- import copy
- from contextlib import closing
- 
--from botocore.vendored import six
-+import six
- 
- from awscli.arguments import CustomArgument, CLIArgument
- from awscli.customizations import utils

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