diff options
author | Mark H Weaver <mhw@netris.org> | 2016-11-06 03:29:06 -0500 |
---|---|---|
committer | Mark H Weaver <mhw@netris.org> | 2016-11-06 03:29:06 -0500 |
commit | 8b6ad165d1fa479e5da2938d099dba356186e07c (patch) | |
tree | c30c024fd79497031c21c68d6c5688334d900467 /gnu/packages/patches/python-ipython-inputhook-ctype.patch | |
parent | 9422c98a0a2bf2c48d8e10e59d838ab23870eb10 (diff) | |
parent | 7f4658983a742072be4e28b227d6349461e9a68b (diff) | |
download | guix-patches-8b6ad165d1fa479e5da2938d099dba356186e07c.tar guix-patches-8b6ad165d1fa479e5da2938d099dba356186e07c.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/python-ipython-inputhook-ctype.patch')
-rw-r--r-- | gnu/packages/patches/python-ipython-inputhook-ctype.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/gnu/packages/patches/python-ipython-inputhook-ctype.patch b/gnu/packages/patches/python-ipython-inputhook-ctype.patch deleted file mode 100644 index c77e310542..0000000000 --- a/gnu/packages/patches/python-ipython-inputhook-ctype.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 04c5d358c7ab74d3ddab4f7662e539393d8604c6 Mon Sep 17 00:00:00 2001 -From: Lucretiel <Lucretiel@users.noreply.github.com> -Date: Wed, 13 May 2015 13:12:43 -0400 -Subject: [PATCH] register now checks for missing ctypes - -If ctypes is None, then no input hooks may be registered; `InputHookManager.register` skips registration of input hook classes. Also updated `__init__` to no longer skip creating the instance attributes, to prevent AttributeError exceptions at load time. ---- - IPython/lib/inputhook.py | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - -diff --git a/IPython/lib/inputhook.py b/IPython/lib/inputhook.py -index 4ae2cb3..6578365 100644 ---- a/IPython/lib/inputhook.py -+++ b/IPython/lib/inputhook.py -@@ -107,8 +107,8 @@ class InputHookManager(object): - def __init__(self): - if ctypes is None: - warn("IPython GUI event loop requires ctypes, %gui will not be available") -- return -- self.PYFUNC = ctypes.PYFUNCTYPE(ctypes.c_int) -+ else: -+ self.PYFUNC = ctypes.PYFUNCTYPE(ctypes.c_int) - self.guihooks = {} - self.aliases = {} - self.apps = {} -@@ -197,10 +197,11 @@ def enable(self, app=None): - ... - """ - def decorator(cls): -- inst = cls(self) -- self.guihooks[toolkitname] = inst -- for a in aliases: -- self.aliases[a] = toolkitname -+ if ctypes is not None: -+ inst = cls(self) -+ self.guihooks[toolkitname] = inst -+ for a in aliases: -+ self.aliases[a] = toolkitname - return cls - return decorator - |