From eac159d1e93d7513ec5c6f5125cd73653be36105 2014-09-29 14:11:20
From: Matthias Bussonnier <bussonniermatthias@gmail.com>
Date: 2014-09-29 14:11:20
Subject: [PATCH] remove python2.5 compat info

---

diff --git a/IPython/core/magics/basic.py b/IPython/core/magics/basic.py
index 6e39335..827f72c 100644
--- a/IPython/core/magics/basic.py
+++ b/IPython/core/magics/basic.py
@@ -362,9 +362,6 @@ Currently the magic system has the following functions:""",
 Proper color support under MS Windows requires the pyreadline library.
 You can find it at:
 http://ipython.org/pyreadline.html
-Gary's readline needs the ctypes module, from:
-http://starship.python.net/crew/theller/ctypes
-(Note that ctypes is already part of Python versions 2.5 and newer).
 
 Defaulting color scheme to 'NoColor'"""
             new_scheme = 'NoColor'
diff --git a/IPython/utils/sysinfo.py b/IPython/utils/sysinfo.py
index bc89cb6..db7f291 100644
--- a/IPython/utils/sysinfo.py
+++ b/IPython/utils/sysinfo.py
@@ -152,10 +152,7 @@ def num_cpus():
 
    ncpufuncs = {'Linux':_num_cpus_unix,
                 'Darwin':_num_cpus_darwin,
-                'Windows':_num_cpus_windows,
-                # On Vista, python < 2.5.2 has a bug and returns 'Microsoft'
-                # See http://bugs.python.org/issue1082 for details.
-                'Microsoft':_num_cpus_windows,
+                'Windows':_num_cpus_windows
                 }
 
    ncpufunc = ncpufuncs.get(platform.system(),