[python-fabio] 10/11: refresh patch

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository python-fabio.

commit 177cee3a7c9904bc2b5e857fd2d93d42c0575b19
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Wed Jul 27 19:07:42 2016 +0200

    refresh patch
---
 debian/changelog                                   |  2 +-
 .../0001-fix-upstream-wrong-six-import.patch       | 72 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b2a4ba2..d307c36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ python-fabio (0.4.0+dfsg-1) unstable; urgency=medium
     * Remove Build-Dep: pymca
   * debian/patchs
     - 0001-fix-the-documentation-build-process.patch (deleted)
-    - 0002-fix-upstream-wrong-six-import.patch (deleted)
+    + 0002 -> 0001-fix-upstream-wrong-six-import.patch (refreshed)
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Wed, 27 Jul 2016 18:31:23 +0200
 
diff --git a/debian/patches/0001-fix-upstream-wrong-six-import.patch b/debian/patches/0001-fix-upstream-wrong-six-import.patch
new file mode 100644
index 0000000..a6d8c07
--- /dev/null
+++ b/debian/patches/0001-fix-upstream-wrong-six-import.patch
@@ -0,0 +1,72 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Wed, 27 Jul 2016 18:57:21 +0200
+Subject: fix-upstream-wrong-six-import
+
+---
+ fabio/compression.py |  7 +------
+ fabio/fabioimage.py  | 12 +-----------
+ fabio/fabioutils.py  |  8 +-------
+ 3 files changed, 3 insertions(+), 24 deletions(-)
+
+diff --git a/fabio/compression.py b/fabio/compression.py
+index 54a4c4c..885640a 100644
+--- a/fabio/compression.py
++++ b/fabio/compression.py
+@@ -46,12 +46,7 @@ import subprocess
+ import numpy
+ 
+ 
+-try:
+-    from .third_party import six
+-except ImportError:
+-    import six
+-    if tuple(int(i) for i in six.__version__.split(".")[:2]) < (1, 8):
+-        raise ImportError("Six version is too old")
++import six
+ if six.PY2:
+     bytes = str
+ 
+diff --git a/fabio/fabioimage.py b/fabio/fabioimage.py
+index 81d728b..d3235d3 100644
+--- a/fabio/fabioimage.py
++++ b/fabio/fabioimage.py
+@@ -49,17 +49,8 @@ except ImportError:
+     Image = None
+ from . import fabioutils, converters
+ 
+-try:
+-    from .third_party.six import with_metaclass
+-except ImportError:
+-    import six
+-    six_version = tuple(int(i) for i in six.__version__.split() if i.isdigit())
+-    if six_version < (1, 8):
+-        for i in ("six", "six.moves"):
+-            sys.modules.pop(i, None)
+-        raise ImportError("Old version")
+-    from six import with_metaclass
+-
++import six
++from six import with_metaclass
+ 
+ try:
+     from collections import OrderedDict
+diff --git a/fabio/fabioutils.py b/fabio/fabioutils.py
+index a2408c0..b799541 100644
+--- a/fabio/fabioutils.py
++++ b/fabio/fabioutils.py
+@@ -40,13 +40,7 @@ import logging
+ import sys
+ logger = logging.getLogger("fabioutils")
+ 
+-try:
+-    from .third_party import six
+-except ImportError:
+-    import six
+-    if tuple(int(i) for i in six.__version__.split(".")[:2]) < (1, 8):
+-        raise ImportError("Six version is too old")
+-
++import six
+ if six.PY2:
+     bytes = str
+     FileIO = file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3a7350e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-fix-upstream-wrong-six-import.patch

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