Show More
@@ -1162,19 +1162,9 b' def _select_shell(argv):' | |||
|
1162 | 1162 | } |
|
1163 | 1163 | |
|
1164 | 1164 | all_opts = set(['tk','pylab','gthread','qthread','q4thread','wthread', |
|
1165 |
'tkthread' |
|
|
1165 | 'tkthread']) | |
|
1166 | 1166 | user_opts = set([s.replace('-','') for s in argv[:3]]) |
|
1167 | special_opts = user_opts & all_opts | |
|
1168 | ||
|
1169 | if 'twisted' in special_opts: | |
|
1170 | if sys.platform == 'win32': | |
|
1171 | import twshell | |
|
1172 | return twshell.IPShellTwisted | |
|
1173 | else: | |
|
1174 | error('-twisted currently only works on win32. Starting normal IPython.') | |
|
1175 | special_opts.remove('twisted') | |
|
1176 | return IPShell | |
|
1177 | ||
|
1167 | special_opts = user_opts & all_opts | |
|
1178 | 1168 | |
|
1179 | 1169 | if 'tk' in special_opts: |
|
1180 | 1170 | USE_TK = True |
@@ -189,7 +189,8 b" object? -> Details about 'object'. ?object also works, ?? prints more." | |||
|
189 | 189 | |
|
190 | 190 | cmdline_only = ('help interact|i ipythondir=s Version upgrade ' |
|
191 | 191 | 'gthread! qthread! q4thread! wthread! tkthread! pylab! tk! ' |
|
192 |
'twisted!' |
|
|
192 | # 'twisted!' # disabled for now. | |
|
193 | ) | |
|
193 | 194 | |
|
194 | 195 | # Build the actual name list to be used by DPyGetOpt |
|
195 | 196 | opts_names = qw(cmdline_opts) + qw(cmdline_only) |
@@ -247,7 +248,7 b" object? -> Details about 'object'. ?object also works, ?? prints more." | |||
|
247 | 248 | system_verbose = 0, |
|
248 | 249 | term_title = 1, |
|
249 | 250 | tk = 0, |
|
250 | twisted= 0, | |
|
251 | #twisted= 0, # disabled for now | |
|
251 | 252 | upgrade = 0, |
|
252 | 253 | Version = 0, |
|
253 | 254 | wildcards_case_sensitive = 1, |
@@ -1,3 +1,17 b'' | |||
|
1 | 2008-05-31 Fernando Perez <Fernando.Perez@berkeley.edu> | |
|
2 | ||
|
3 | * IPython/ipmaker.py (make_IPython): The -twisted option is fully | |
|
4 | disabled. | |
|
5 | ||
|
6 | * IPython/Shell.py (_select_shell): completely disable -twisted. | |
|
7 | This code is of dubious quality and normal users should not | |
|
8 | encounter it until we can clarify things further, even under | |
|
9 | win32. Since we need a quick emergency 0.8.4 release, it is now | |
|
10 | disabled completely. Users who want to run it can use the | |
|
11 | following command (it's easy to put it in an alias or script): | |
|
12 | ||
|
13 | python -c"from IPython import twshell;twshell.IPShellTwisted().mainloop()" | |
|
14 | ||
|
1 | 15 | 2008-05-30 Ville Vainio <vivainio@gmail.com> |
|
2 | 16 | |
|
3 | 17 | * shell.py: disable -twisted on non-win32 platforms. |
General Comments 0
You need to be logged in to leave comments.
Login now