From a0c73bd83256e501f985892545d8d0bfd33c2b84 2014-05-16 18:32:20 From: Thomas Kluyver Date: 2014-05-16 18:32:20 Subject: [PATCH] Catch more errors from clipboard access on Windows --- diff --git a/IPython/lib/clipboard.py b/IPython/lib/clipboard.py index 3bc444f..ac9b685 100644 --- a/IPython/lib/clipboard.py +++ b/IPython/lib/clipboard.py @@ -22,11 +22,11 @@ def win32_clipboard_get(): win32clipboard.OpenClipboard() try: text = win32clipboard.GetClipboardData(win32clipboard.CF_UNICODETEXT) - except TypeError: + except (TypeError, win32clipboard.error): try: text = win32clipboard.GetClipboardData(win32clipboard.CF_TEXT) text = py3compat.cast_unicode(text, py3compat.DEFAULT_ENCODING) - except TypeError: + except (TypeError, win32clipboard.error): raise ClipboardEmpty finally: win32clipboard.CloseClipboard()