From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
 <picca@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