[python-fabio] 72/73: fix the 0002 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 4d2db2e7acba724836550ea2d8f9b5ef7b9c61b9
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date:   Tue Jan 5 10:41:58 2016 +0100

    fix the 0002 patch
---
 .../0002-fix-upstream-wrong-six-import.patch       | 36 ++++++++++++++++------
 1 file changed, 26 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 f805c4a..617e005 100644
--- a/debian/patches/0002-fix-upstream-wrong-six-import.patch
+++ b/debian/patches/0002-fix-upstream-wrong-six-import.patch
@@ -1,17 +1,22 @@
 From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
  <picca at synchrotron-soleil.fr>
-Date: Mon, 4 Jan 2016 16:08:49 +0100
+Date: Tue, 5 Jan 2016 10:41:14 +0100
 Subject: fix upstream wrong six import
 
+The six check logic in fabioimage was wrong.
+let's deal with the six import in only one place (fabioutils)
+Then import six from there. This reduce the ducplication code.
+Use also the distutils.version module to deal with module
+version comparisons.
 ---
  fabio-src/cbfimage.py    |  5 +++--
  fabio-src/compression.py |  8 +-------
- fabio-src/fabioimage.py  | 11 +----------
+ fabio-src/fabioimage.py  | 13 ++-----------
  fabio-src/fabioutils.py  |  7 ++++++-
- test/testcbfimage.py     |  2 +-
+ test/testcbfimage.py     |  4 ++--
  test/testedfimage.py     |  2 +-
  test/testfabioimage.py   |  2 +-
- 7 files changed, 14 insertions(+), 23 deletions(-)
+ 7 files changed, 16 insertions(+), 25 deletions(-)
 
 diff --git a/fabio-src/cbfimage.py b/fabio-src/cbfimage.py
 index c3892d9..9440ecb 100644
@@ -54,7 +59,7 @@ index 335bb7e..1748caf 100644
  if six.PY2:
      bytes = str
 diff --git a/fabio-src/fabioimage.py b/fabio-src/fabioimage.py
-index b678123..89c520a 100644
+index b678123..0c81b25 100644
 --- a/fabio-src/fabioimage.py
 +++ b/fabio-src/fabioimage.py
 @@ -50,16 +50,7 @@ except ImportError:
@@ -71,10 +76,19 @@ index b678123..89c520a 100644
 -    from six import with_metaclass
 -except ImportError:
 -    from .third_party.six import with_metaclass
-+from .fabioutils.six import with_metaclass
++from .fabioutils import six
  
  try:
      from collections import OrderedDict
+@@ -79,7 +70,7 @@ class FabioMeta(type):
+         super(FabioMeta, cls).__init__(name, bases, dct)
+ 
+ 
+-class FabioImage(with_metaclass(FabioMeta, object)):
++class FabioImage(six.with_metaclass(FabioMeta, object)):
+     """
+     A common object for images in fable
+     Contains a numpy array (.data) and dict of meta data (.header)
 diff --git a/fabio-src/fabioutils.py b/fabio-src/fabioutils.py
 index 74f4730..d98f7d7 100644
 --- a/fabio-src/fabioutils.py
@@ -94,18 +108,20 @@ index 74f4730..d98f7d7 100644
  except ImportError:
      from .third_party import six
 diff --git a/test/testcbfimage.py b/test/testcbfimage.py
-index ca6f921..76c5810 100755
+index ca6f921..d6f303d 100755
 --- a/test/testcbfimage.py
 +++ b/test/testcbfimage.py
-@@ -48,7 +48,7 @@ logger = UtilsTest.get_logger(__file__)
+@@ -48,8 +48,8 @@ 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:
+-if PY3:
++from fabio.fabioutils import six
++if six.PY3:
      from fabio.fabioutils import unicode
  
+ 
 diff --git a/test/testedfimage.py b/test/testedfimage.py
 index 47fe2f6..0b2f48d 100755
 --- a/test/testedfimage.py

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