From 2e9b676d27e86a9fb9791aa1a63d6bf433265383 2008-05-30 14:03:07 From: Ville M. Vainio Date: 2008-05-30 14:03:07 Subject: [PATCH] Disable -twisted on non-win32 platforms --- diff --git a/IPython/Shell.py b/IPython/Shell.py index 1e91d54..aa88755 100644 --- a/IPython/Shell.py +++ b/IPython/Shell.py @@ -1167,8 +1167,15 @@ def _select_shell(argv): special_opts = user_opts & all_opts if 'twisted' in special_opts: - import twshell - return twshell.IPShellTwisted + if sys.platform == 'win32': + import twshell + return twshell.IPShellTwisted + else: + error('-twisted currently only works on win32. Starting normal IPython.') + special_opts.remove('twisted') + return IPShell + + if 'tk' in special_opts: USE_TK = True special_opts.remove('tk')