[Python-modules-commits] [python-igraph] 01/02: Fix #862054.

[Hugo Lefeuvre]

This is an automated email from the git hooks/post-receive script.

hle pushed a commit to branch master
in repository python-igraph.

commit 0756213ea09c6d743a5340f77c5ee612ffbb54d4
Author: Hugo Lefeuvre <hle at debian.org>
Date:   Sat Jun 10 10:23:20 2017 +0200

    Fix #862054.
    
    * Bump compat level to 10 and update debhelper dependency accordingly.
    * Bump copyright years in debian/copyright.
    * Fix AttributeError when plotting graph inline in jupyter notebook
      (Closes: #862054).
---
 debian/changelog                                |  9 ++++++++
 debian/compat                                   |  2 +-
 debian/control                                  |  2 +-
 debian/copyright                                |  4 ++--
 debian/patches/fix-attributeerror-jupyter.patch | 28 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 6 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f1f031..57ed897 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python-igraph (0.7.1.post6-4) experimental; urgency=low
+
+  * Bump compat level to 10 and update debhelper dependency accordingly.
+  * Bump copyright years in debian/copyright.
+  * Fix AttributeError when plotting graph inline in jupyter notebook
+    (Closes: #862054).
+
+ -- Hugo Lefeuvre <hle at debian.org>  Sat, 10 Jun 2017 10:10:02 +0200
+
 python-igraph (0.7.1.post6-3) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 4133ac3..596f895 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> 
 Uploaders: TANIGUCHI Takaki <takaki at debian.org>,
            Hugo Lefeuvre <hle at debian.org>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
                dh-python,
 	       python-all-dev,
 	       python-setuptools,
diff --git a/debian/copyright b/debian/copyright
index da28d2a..6b10cc8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,13 +4,13 @@ Source: http://pypi.python.org/pypi/python-igraph
 
 Files: *
 Copyright: 
- 2006-2016 Gabor Csardi <csardi at rmki.kfki.hu>,
+ 2006-2017 Gabor Csardi <csardi at rmki.kfki.hu>,
            Tamas Nepusz <tamas at cs.rhul.ac.uk>
 License: GPL-2.0+
 
 Files: debian/*
 Copyright: 2012-2016 TANIGUCHI Takaki <takaki at debian.org>
-           2016 Hugo Lefeuvre <hle at debian.org>
+           2016-2017 Hugo Lefeuvre <hle at debian.org>
 License: GPL-2.0+
 
 License: GPL-2.0+
diff --git a/debian/patches/fix-attributeerror-jupyter.patch b/debian/patches/fix-attributeerror-jupyter.patch
new file mode 100644
index 0000000..d42d49a
--- /dev/null
+++ b/debian/patches/fix-attributeerror-jupyter.patch
@@ -0,0 +1,28 @@
+Subject: Fix AttributeError when plotting graph inline in jupyter notebook.
+Origin: upstream
+Bug-Debian: https://bugs.debian.org/862054
+Applied-Upstream: https://github.com/igraph/python-igraph/commit/8864b46849b031a3013764d03e167222963c0f5d
+
+--- a/igraph/drawing/__init__.py	2017-03-29 18:39:59.000000000 +0200
++++ b/igraph/drawing/__init__.py	2017-06-10 10:16:46.178406832 +0200
+@@ -14,7 +14,6 @@
+ 
+ from __future__ import with_statement
+ 
+-from cStringIO import StringIO
+ from warnings import warn
+ 
+ import os
+@@ -351,7 +350,11 @@
+         context.show_page()
+         surface.finish()
+         # Return the raw SVG representation
+-        return io.getvalue().encode("utf-8")
++        result = io.getvalue()
++        if hasattr(result, "encode"):
++            return result.encode("utf-8")          # for Python 2.x
++        else:
++            return result.decode("utf-8")          # for Python 3.x
+ 
+     @property
+     def bounding_box(self):
diff --git a/debian/patches/series b/debian/patches/series
index 62ce41b..74b228f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix-attributeerror-jupyter.patch
 fix-test-case-failures.patch

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