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

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

    Date: Tuesday, February 26, 2013 @ 18:07:13
  Author: jtaylor-guest
Revision: 23603

add tkinter package to debianize-error-messages.patch (Closes: #701707)

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	2013-02-26 18:07:08 UTC (rev 23602)
+++ packages/ipython/trunk/debian/changelog	2013-02-26 18:07:13 UTC (rev 23603)
@@ -13,6 +13,7 @@
   * add autopkgtests
   * Added-missing-quotes.patch: fix missing quotes
   * linenoless-traceback.patch: fix crash on tracebacks without line numbers
+  * add tkinter package to debianize-error-messages.patch (Closes: #701707)
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 02 Feb 2013 11:14:27 +0100
 

Modified: packages/ipython/trunk/debian/patches/debianize-error-messages.patch
===================================================================
--- packages/ipython/trunk/debian/patches/debianize-error-messages.patch	2013-02-26 18:07:08 UTC (rev 23602)
+++ packages/ipython/trunk/debian/patches/debianize-error-messages.patch	2013-02-26 18:07:13 UTC (rev 23603)
@@ -2,11 +2,6 @@
 Date: Thu, 7 Jul 2011 18:19:04 +0200
 Subject: debianize error messages
 
----
- IPython/scripts/ipython |    6 +++++-
- IPython/zmq/__init__.py |    4 ++--
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
 --- a/IPython/scripts/ipython
 +++ b/IPython/scripts/ipython
 @@ -4,4 +4,13 @@
@@ -26,7 +21,7 @@
 +    raise
 --- a/IPython/zmq/__init__.py
 +++ b/IPython/zmq/__init__.py
-@@ -50,12 +50,12 @@
+@@ -50,12 +50,12 @@ def check_for_zmq(minimum_version, modul
      try:
          import zmq
      except ImportError:
@@ -41,3 +36,16 @@
                          module, minimum_version, pyzmq_version))
  
      if V(zmq.zmq_version()) >= V('4.0.0'):
+--- a/IPython/lib/clipboard.py
++++ b/IPython/lib/clipboard.py
+@@ -43,8 +43,9 @@ def tkinter_clipboard_get():
+     try:
+         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")
+     root = Tkinter.Tk()
+     root.withdraw()
+     text = root.clipboard_get()