Package: transifex-client
Version: 0.11.1+git15~g655c5e9
Severity: important
Tags: patch

Transifex imports six from urlilib3 embedded version.
Since python-urllib3 (1.13.1-1) debian dropped the
embedded six module which, although it makes sense, broke
transifex-client.

Please consider applying the attached patch that switches
imports to python-six.


>From 6937c1065204cd6801f6cefe9fa7b5d9a37fe4e3 Mon Sep 17 00:00:00 2001
From: Christos Trochalakis <yati...@ideopolis.gr>
Date: Mon, 7 Mar 2016 12:16:39 +0200
Subject: [PATCH] Use six library instead of the one embedded in urllib3

---
 requirements.txt   | 1 +
 txclib/commands.py | 2 +-
 txclib/config.py   | 2 +-
 txclib/project.py  | 2 +-
 txclib/utils.py    | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

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/commands.py b/txclib/commands.py
index 122ecca..b221c02 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/config.py b/txclib/config.py
index f37f0a6..4bad9da 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):
diff --git a/txclib/project.py b/txclib/project.py
index 0961abf..55c24ae 100644
--- a/txclib/project.py
+++ b/txclib/project.py
@@ -18,7 +18,7 @@ except ImportError:
 from txclib import web
 from txclib import utils
 from urllib3.exceptions import SSLError
-from urllib3.packages import six
+import six
 from txclib.urls import API_URLS
 from txclib.config import OrderedRawConfigParser, Flipdict
 from txclib.log import logger
diff --git a/txclib/utils.py b/txclib/utils.py
index 3f4ed81..75263fb 100644
--- a/txclib/utils.py
+++ b/txclib/utils.py
@@ -13,8 +13,8 @@ except ImportError:
 
 from email.parser import Parser
 from urllib3.exceptions import SSLError
-from urllib3.packages import six
-from urllib3.packages.six.moves import input
+import six
+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.7.0

Reply via email to