[python-fabio] 08/08: 0002-fix-upstream-wrong-six-import.patch
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Tue Jan 5 11:34:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch toto
in repository python-fabio.
commit 54ed7046801e1f3571d43fb5a25c171ad0916d1f
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Mon Jan 4 15:03:00 2016 +0100
0002-fix-upstream-wrong-six-import.patch
---
debian/changelog | 1 +
.../0002-fix-upstream-wrong-six-import.patch | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 24 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 4d5e285..eea0bb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ python-fabio (0.3.0+dfsg-1) unstable; urgency=medium
* debian/patchs
- 0001-fix-the-build-system.patch (removed)
+ 0001-fix-the-documentation-build-process.patch (added)
+ + 0002-fix-upstream-wrong-six-import.patch (added)
-- Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr> Mon, 04 Jan 2016 11:34:23 +0100
diff --git a/debian/patches/0002-fix-upstream-wrong-six-import.patch b/debian/patches/0002-fix-upstream-wrong-six-import.patch
new file mode 100644
index 0000000..fe014b4
--- /dev/null
+++ b/debian/patches/0002-fix-upstream-wrong-six-import.patch
@@ -0,0 +1,22 @@
+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
+Subject: fix upstream wrong six import
+
+---
+ fabio-src/fabioimage.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fabio-src/fabioimage.py b/fabio-src/fabioimage.py
+index b678123..a42b994 100644
+--- a/fabio-src/fabioimage.py
++++ b/fabio-src/fabioimage.py
+@@ -52,7 +52,7 @@ from . import fabioutils, converters
+
+ 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)
diff --git a/debian/patches/series b/debian/patches/series
index baeb2c1..92184fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
0001-fix-the-documentation-build-process.patch
+0002-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
More information about the debian-science-commits
mailing list