[python-fabio] 04/04: remove useless 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 74bddbe9a704363b87aba63bb945e7e1c5c49630
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Sep 2 18:06:13 2017 +0200

    remove useless patch
---
 .../0001-fix-upstream-wrong-six-import.patch       | 72 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 73 deletions(-)

diff --git a/debian/patches/0001-fix-upstream-wrong-six-import.patch b/debian/patches/0001-fix-upstream-wrong-six-import.patch
deleted file mode 100644
index a6d8c07..0000000
--- a/debian/patches/0001-fix-upstream-wrong-six-import.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-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
deleted file mode 100644
index 3a7350e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-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