[Python-modules-commits] r27546 - in packages/ipython/trunk/debian (2 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Wednesday, February 5, 2014 @ 19:34:26
  Author: jtaylor-guest
Revision: 27546

update debianize-error-messages.patch:

fix %paste (Closes: #736175)
add pandoc package reference (Closes: #736566)

Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/patches/debianize-error-messages.patch

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2014-02-05 19:34:23 UTC (rev 27545)
+++ packages/ipython/trunk/debian/changelog	2014-02-05 19:34:26 UTC (rev 27546)
@@ -1,9 +1,12 @@
 ipython (1.2.0~rc1-1) unstable; urgency=low
 
   * New upstream release candidate
-    Closes: #737067, #736560
+    fixes nbconvert html convert (Closes: #737067, #736560)
   * drop applied patches: python3.4-fixes.patch, test-fix.patch
   * add test-default-tk.patch to run tests with Debian's matplotlib default
+  * update debianize-error-messages.patch:
+     - fix %paste (Closes: #736175)
+     - add pandoc package reference (Closes: #736566)
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Wed, 05 Feb 2014 19:07:18 +0100
 

Modified: packages/ipython/trunk/debian/patches/debianize-error-messages.patch
===================================================================
--- packages/ipython/trunk/debian/patches/debianize-error-messages.patch	2014-02-05 19:34:23 UTC (rev 27545)
+++ packages/ipython/trunk/debian/patches/debianize-error-messages.patch	2014-02-05 19:34:26 UTC (rev 27546)
@@ -30,11 +30,9 @@
  # utility functions, for convenience
 --- a/IPython/lib/clipboard.py
 +++ b/IPython/lib/clipboard.py
-@@ -43,8 +43,9 @@ def tkinter_clipboard_get():
-     try:
+@@ -44,7 +44,7 @@ def tkinter_clipboard_get():
          import Tkinter
      except ImportError:
-+        from IPython.utils import py3compat
          raise TryNext("Getting text from the clipboard on this platform "
 -                      "requires Tkinter.")
 +                      "requires the %s-tk package." % ("python3" if py3compat.PY3 else "python"))
@@ -59,3 +57,15 @@
 +        raise ImportError("%s requires python-zmq >= %s, but you have %s"%(
                          required_by, minimum_version, pyzmq_version))
  
+--- a/IPython/nbconvert/utils/pandoc.py
++++ b/IPython/nbconvert/utils/pandoc.py
+@@ -61,8 +61,7 @@ def pandoc(source, fmt, to, extra_args=N
+     except OSError as e:
+         raise PandocMissing(
+             "The command '%s' returned an error: %s.\n" %(" ".join(command), e) +
+-            "Please check that pandoc is installed:\n" +
+-            "http://johnmacfarlane.net/pandoc/installing.html"
++            "Please check that pandoc package is installed."
+         )
+     out, _ = p.communicate(cast_bytes(source, encoding))
+     out = TextIOWrapper(BytesIO(out), encoding, 'replace').read()