[itango] 01/01: Import Debian patch 0.1.4-1~exp1

[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 itango.

commit 653da4fbee52a67355f1de8c5bdcf25590b2f2f4
Merge: a026391 17f02d6
Author: Sandor Bodo-Merle <sbodomerle at gmail.com>
Date:   Tue Sep 13 10:09:49 2016 +0200

    Import Debian patch 0.1.4-1~exp1

 README.rst                                         |  6 +-
 debian/changelog                                   |  7 ++
 ...0002-basestring-is-not-python3-compatible.patch | 25 +++++++
 debian/patches/series                              |  1 +
 itango/__init__.py                                 | 21 ++++--
 itango/install.py                                  | 27 +++++++-
 itango/itango.py                                   | 79 +++++++++++++++-------
 setup.py                                           |  6 +-
 8 files changed, 132 insertions(+), 40 deletions(-)

diff --cc debian/changelog
index c2de776,0000000..77ce602
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,12 @@@
++itango (0.1.4-1~exp1) experimental; urgency=medium
++
++  * New upstream version 0.1.4
++    + Partial support for IPython 5, Jupyter and qtconsole
++
++ -- Sandor Bodo-Merle <sbodomerle at gmail.com>  Tue, 13 Sep 2016 10:09:49 +0200
++
 +itango (0.1.3-1~exp1) experimental; urgency=medium
 +
 +  * Initial release. (Closes: #836514)
 +
 + -- Sandor Bodo-Merle <sbodomerle at gmail.com>  Mon, 29 Aug 2016 13:57:06 +0200
diff --cc debian/patches/0002-basestring-is-not-python3-compatible.patch
index 0000000,0000000..6598475
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-basestring-is-not-python3-compatible.patch
@@@ -1,0 -1,0 +1,25 @@@
++From 04b0b61a47795f888d1dbc04aa2824b7c1651a55 Mon Sep 17 00:00:00 2001
++From: Bodo-Merle Sandor <sbodomerle at gmail.com>
++Date: Tue, 13 Sep 2016 11:19:19 +0200
++Subject: [PATCH 1/2] basestring is not python3 compatible
++
++---
++ itango/itango.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/itango/itango.py b/itango/itango.py
++index 9a195e2..2c44747 100644
++--- a/itango/itango.py
+++++ b/itango/itango.py
++@@ -1374,7 +1374,7 @@ def patch_qt_console():
++         def _banner_default(self):
++             config = get_config()
++             banner = config.ITangoConsole.banner
++-            return banner if isinstance(banner, basestring) else ''
+++            return banner if isinstance(banner, str) else ''
++ 
++     # Patch widget factory
++     try:
++-- 
++2.9.3
++
diff --cc debian/patches/series
index 3dca167,0000000..b23bc19
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-doc-spelling-fixes.patch
++0002-basestring-is-not-python3-compatible.patch

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