[Python-modules-commits] [transifex-client] 01/09: Imported Debian patch 0.11.1+git15~g655c5e9-1.1

[Hans-Christoph Steiner]

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

eighthave pushed a commit to branch master
in repository transifex-client.

commit 996353184b0752472150cf3b42a81fdf42e14dca
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sat Sep 3 22:17:45 2016 +0200

    Imported Debian patch 0.11.1+git15~g655c5e9-1.1
---
 debian/changelog                                   |  9 ++++
 ...Remove-dependency-on-urllib3.packages.six.patch | 25 +++++++++++
 .../fix-more-invocations-of-six-methods.patch      | 48 ++++++++++++++++++++++
 debian/patches/series                              |  3 ++
 .../use-input-from-six.moves.-Fixes-123.patch      | 41 ++++++++++++++++++
 5 files changed, 126 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 570a767..ffa83ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+transifex-client (0.11.1+git15~g655c5e9-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Use the six library instead of the one embedded in urllib3.
+    - Backport upstream commits.
+    - Closes: #817038
+
+ -- Felix Geyer <fgeyer at debian.org>  Sat, 03 Sep 2016 22:17:45 +0200
+
 transifex-client (0.11.1+git15~g655c5e9-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/Remove-dependency-on-urllib3.packages.six.patch b/debian/patches/Remove-dependency-on-urllib3.packages.six.patch
new file mode 100644
index 0000000..f30731c
--- /dev/null
+++ b/debian/patches/Remove-dependency-on-urllib3.packages.six.patch
@@ -0,0 +1,25 @@
+From e20e19d2d3e5ca0df633cc5c799b9b0f90012395 Mon Sep 17 00:00:00 2001
+From: Konstantinos Koukopoulos <kouk at transifex.com>
+Date: Fri, 17 Jun 2016 09:11:06 +0300
+Subject: [PATCH 3/3] Remove dependency on urllib3.packages.six
+
+---
+ txclib/config.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/txclib/config.py b/txclib/config.py
+index 2459a0a..bda8b9d 100644
+--- a/txclib/config.py
++++ b/txclib/config.py
+@@ -3,7 +3,7 @@ try:
+ except ImportError:
+     import ConfigParser as configparser
+ 
+-from urllib3.packages import six
++import six
+ 
+ 
+ class OrderedRawConfigParser(configparser.RawConfigParser):
+-- 
+2.9.3
+
diff --git a/debian/patches/fix-more-invocations-of-six-methods.patch b/debian/patches/fix-more-invocations-of-six-methods.patch
new file mode 100644
index 0000000..1f4d6c0
--- /dev/null
+++ b/debian/patches/fix-more-invocations-of-six-methods.patch
@@ -0,0 +1,48 @@
+From 8c3358d2689ef8a8ce4a6a038873325c0982cbbb Mon Sep 17 00:00:00 2001
+From: Konstantinos Koukopoulos <kouk at kouk-mbp-3.local>
+Date: Tue, 14 Jun 2016 19:04:27 +0300
+Subject: [PATCH 2/3] fix more invocations of six methods
+
+---
+ txclib/commands.py | 2 +-
+ txclib/utils.py    | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/txclib/commands.py b/txclib/commands.py
+index 0198501..b99928e 100644
+--- a/txclib/commands.py
++++ b/txclib/commands.py
+@@ -25,7 +25,7 @@ try:
+ except ImportError:
+     import ConfigParser as configparser
+ 
+-from urllib3.packages.six.moves import input
++from six.moves import input
+ 
+ from txclib import utils, project
+ from txclib.utils import parse_json, compile_json, files_in_project
+diff --git a/txclib/utils.py b/txclib/utils.py
+index 691d3f9..2198749 100644
+--- a/txclib/utils.py
++++ b/txclib/utils.py
+@@ -6,6 +6,7 @@ import errno
+ import errno
+ import ssl
+ import urllib3
++import six
+ 
+ try:
+     from json import loads as parse_json, dumps as compile_json
+@@ -14,8 +15,7 @@ except ImportError:
+ 
+ from email.parser import Parser
+ from urllib3.exceptions import SSLError
+-from urllib3.packages import six
+-from urllib3.packages.six.moves import input
++from six.moves import input
+ from txclib.urls import API_URLS
+ from txclib.exceptions import UnknownCommandError
+ from txclib.paths import posix_path, native_path, posix_sep
+-- 
+2.9.3
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..32ae58d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+use-input-from-six.moves.-Fixes-123.patch
+fix-more-invocations-of-six-methods.patch
+Remove-dependency-on-urllib3.packages.six.patch
diff --git a/debian/patches/use-input-from-six.moves.-Fixes-123.patch b/debian/patches/use-input-from-six.moves.-Fixes-123.patch
new file mode 100644
index 0000000..a43e45c
--- /dev/null
+++ b/debian/patches/use-input-from-six.moves.-Fixes-123.patch
@@ -0,0 +1,41 @@
+From 453388547df9665872cfb25fadf98eba0c4a5910 Mon Sep 17 00:00:00 2001
+From: Konstantinos Koukopoulos <kouk at kouk-mbp-3.local>
+Date: Tue, 14 Jun 2016 18:47:50 +0300
+Subject: [PATCH 1/3] use input from six.moves. Fixes: #123
+
+---
+ requirements.txt  | 1 +
+ txclib/project.py | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index a42590b..71aa090 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -1 +1,2 @@
+ urllib3
++six
+diff --git a/txclib/project.py b/txclib/project.py
+index 78eac7a..9b24841 100644
+--- a/txclib/project.py
++++ b/txclib/project.py
+@@ -9,6 +9,7 @@ import time
+ import ssl
+ import sys
+ import urllib3
++import six
+ 
+ try:
+     import configparser
+@@ -18,7 +19,7 @@ except ImportError:
+ from txclib import web
+ from txclib import utils
+ from urllib3.exceptions import SSLError
+-from urllib3.packages import six
++from six.moves import input
+ from txclib.urls import API_URLS
+ from txclib.config import OrderedRawConfigParser, Flipdict
+ from txclib.log import logger
+-- 
+2.9.3
+

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