From 100633c4bebc8216c62d62a3523abd5d617b0ed7 2014-05-21 04:27:00 From: MinRK Date: 2014-05-21 04:27:00 Subject: [PATCH] Backport PR #5869: 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()