Show More
@@ -362,9 +362,6 b' Currently the magic system has the following functions:""",' | |||
|
362 | 362 | Proper color support under MS Windows requires the pyreadline library. |
|
363 | 363 | You can find it at: |
|
364 | 364 | http://ipython.org/pyreadline.html |
|
365 | Gary's readline needs the ctypes module, from: | |
|
366 | http://starship.python.net/crew/theller/ctypes | |
|
367 | (Note that ctypes is already part of Python versions 2.5 and newer). | |
|
368 | 365 | |
|
369 | 366 | Defaulting color scheme to 'NoColor'""" |
|
370 | 367 | new_scheme = 'NoColor' |
@@ -152,10 +152,7 b' def num_cpus():' | |||
|
152 | 152 | |
|
153 | 153 | ncpufuncs = {'Linux':_num_cpus_unix, |
|
154 | 154 | 'Darwin':_num_cpus_darwin, |
|
155 |
'Windows':_num_cpus_windows |
|
|
156 | # On Vista, python < 2.5.2 has a bug and returns 'Microsoft' | |
|
157 | # See http://bugs.python.org/issue1082 for details. | |
|
158 | 'Microsoft':_num_cpus_windows, | |
|
155 | 'Windows':_num_cpus_windows | |
|
159 | 156 | } |
|
160 | 157 | |
|
161 | 158 | ncpufunc = ncpufuncs.get(platform.system(), |
General Comments 0
You need to be logged in to leave comments.
Login now