[python-fabio] 71/73: better fix for the six problem

[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 a997822c2c790fe3922590371a4a6c871d2cff01
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Mon Jan 4 16:09:16 2016 +0100

    better fix for the six problem
---
 .../0002-fix-upstream-wrong-six-import.patch       | 132 +++++++++++++++++++--
 1 file changed, 122 insertions(+), 10 deletions(-)

diff --git a/debian/patches/0002-fix-upstream-wrong-six-import.patch b/debian/patches/0002-fix-upstream-wrong-six-import.patch
index fe014b4..f805c4a 100644
--- a/debian/patches/0002-fix-upstream-wrong-six-import.patch
+++ b/debian/patches/0002-fix-upstream-wrong-six-import.patch
@@ -1,22 +1,134 @@
 From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
  <picca at synchrotron-soleil.fr>
-Date: Mon, 4 Jan 2016 15:02:36 +0100
+Date: Mon, 4 Jan 2016 16:08:49 +0100
 Subject: fix upstream wrong six import
 
 ---
- fabio-src/fabioimage.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ fabio-src/cbfimage.py    |  5 +++--
+ fabio-src/compression.py |  8 +-------
+ fabio-src/fabioimage.py  | 11 +----------
+ fabio-src/fabioutils.py  |  7 ++++++-
+ test/testcbfimage.py     |  2 +-
+ test/testedfimage.py     |  2 +-
+ test/testfabioimage.py   |  2 +-
+ 7 files changed, 14 insertions(+), 23 deletions(-)
 
+diff --git a/fabio-src/cbfimage.py b/fabio-src/cbfimage.py
+index c3892d9..9440ecb 100644
+--- a/fabio-src/cbfimage.py
++++ b/fabio-src/cbfimage.py
+@@ -49,7 +49,8 @@ __version__ = ["Generated by CIF.py: Jan 2005 - Oct 2015",
+ import os, logging
+ import numpy
+ from .fabioimage import FabioImage
+-from .compression import compByteOffset, decByteOffset, md5sum, six
++from .fabioutils import six
++from .compression import compByteOffset, decByteOffset, md5sum
+ 
+ logger = logging.getLogger("CbfImage")
+ 
+@@ -863,4 +864,4 @@ class CIF(dict):
+         except ValueError:
+             return False
+ 
+-cbfimage = CbfImage
+\ No newline at end of file
++cbfimage = CbfImage
+diff --git a/fabio-src/compression.py b/fabio-src/compression.py
+index 335bb7e..1748caf 100644
+--- a/fabio-src/compression.py
++++ b/fabio-src/compression.py
+@@ -44,13 +44,7 @@ import struct
+ import logging
+ logger = logging.getLogger("compression")
+ 
+-try:
+-    import six
+-    if tuple(int(i) for i in six.__version__.split(".")[:2]) < (1, 8):
+-        raise ImportError("Six version is too old")
+-except ImportError:
+-    from .third_party import six
+-
++from .fabioutils import six
+ 
+ if six.PY2:
+     bytes = str
 diff --git a/fabio-src/fabioimage.py b/fabio-src/fabioimage.py
-index b678123..a42b994 100644
+index b678123..89c520a 100644
 --- a/fabio-src/fabioimage.py
 +++ b/fabio-src/fabioimage.py
-@@ -52,7 +52,7 @@ from . import fabioutils, converters
+@@ -50,16 +50,7 @@ except ImportError:
+     Image = None
+ from . import fabioutils, converters
+ 
+-try:
+-    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
+-except ImportError:
+-    from .third_party.six import with_metaclass
++from .fabioutils.six import with_metaclass
  
  try:
+     from collections import OrderedDict
+diff --git a/fabio-src/fabioutils.py b/fabio-src/fabioutils.py
+index 74f4730..d98f7d7 100644
+--- a/fabio-src/fabioutils.py
++++ b/fabio-src/fabioutils.py
+@@ -37,7 +37,12 @@ import re, os, logging, threading, sys
+ logger = logging.getLogger("fabioutils")
+ try:
      import six
--    six_version = tuple(int(i) for i in six.__version__.split() if i.isdigit())
-+    six_version = tuple(int(i) for i in six.__version__.split(".")[:2] if i.isdigit())
-     if six_version < (1, 8):
-         for i in ("six", "six.moves"):
-             sys.modules.pop(i, None)
+-    if tuple(int(i) for i in six.__version__.split(".")[:2]) < (1, 8):
++
++    from distutils.version import StrictVersion as V
++
++    if V(six.__version__) < V("1.8"):
++        for i in ("six", "six.moves"):
++            sys.modules.pop(i, None)
+         raise ImportError("Six version is too old")
+ except ImportError:
+     from .third_party import six
+diff --git a/test/testcbfimage.py b/test/testcbfimage.py
+index ca6f921..76c5810 100755
+--- a/test/testcbfimage.py
++++ b/test/testcbfimage.py
+@@ -48,7 +48,7 @@ logger = UtilsTest.get_logger(__file__)
+ fabio = sys.modules["fabio"]
+ from fabio.cbfimage import cbfimage
+ from fabio.compression import decByteOffset_numpy, decByteOffset_cython
+-from fabio.third_party.six import PY3
++from fabio.fabioutils.six import PY3
+ if PY3:
+     from fabio.fabioutils import unicode
+ 
+diff --git a/test/testedfimage.py b/test/testedfimage.py
+index 47fe2f6..0b2f48d 100755
+--- a/test/testedfimage.py
++++ b/test/testedfimage.py
+@@ -44,7 +44,7 @@ from .utilstest import UtilsTest
+ logger = UtilsTest.get_logger(__file__)
+ fabio = sys.modules["fabio"]
+ from fabio.edfimage import edfimage
+-from fabio.third_party import six
++from fabio.fabioutils import six
+ 
+ 
+ class TestFlatEdfs(unittest.TestCase):
+diff --git a/test/testfabioimage.py b/test/testfabioimage.py
+index 5d6ef20..8927020 100644
+--- a/test/testfabioimage.py
++++ b/test/testfabioimage.py
+@@ -44,7 +44,7 @@ from .utilstest import UtilsTest
+ logger = UtilsTest.get_logger(__file__)
+ fabio = sys.modules["fabio"]
+ from fabio.fabioimage import fabioimage
+-from fabio.third_party import six
++from fabio.fabioutils import six
+ 
+ class test50000(unittest.TestCase):
+     """ test with 50000 everywhere"""

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