##// END OF EJS Templates
update version-check message in setup.py and IPython.__init__...
MinRK -
Show More
@@ -28,8 +28,8 b' import sys'
28 #-----------------------------------------------------------------------------
28 #-----------------------------------------------------------------------------
29
29
30 # Don't forget to also update setup.py when this changes!
30 # Don't forget to also update setup.py when this changes!
31 if sys.version[0:3] < '2.6':
31 if sys.version_info[:2] < (2,7):
32 raise ImportError('Python Version 2.6 or above is required for IPython.')
32 raise ImportError('IPython requires Python Version 2.7 or above.')
33
33
34 # Make it easy to import extensions - they are always directly on pythonpath.
34 # Make it easy to import extensions - they are always directly on pythonpath.
35 # Therefore, non-IPython modules can be added to extensions directory.
35 # Therefore, non-IPython modules can be added to extensions directory.
@@ -26,12 +26,10 b' import sys'
26
26
27 # This check is also made in IPython/__init__, don't forget to update both when
27 # This check is also made in IPython/__init__, don't forget to update both when
28 # changing Python version requirements.
28 # changing Python version requirements.
29 #~ if sys.version[0:3] < '2.6':
29 if sys.version_info[:2] < (2,7):
30 #~ error = """\
30 error = "ERROR: IPython requires Python Version 2.7 or above."
31 #~ ERROR: 'IPython requires Python Version 2.6 or above.'
31 print(error, file=sys.stderr)
32 #~ Exiting."""
32 sys.exit(1)
33 #~ print >> sys.stderr, error
34 #~ sys.exit(1)
35
33
36 PY3 = (sys.version_info[0] >= 3)
34 PY3 = (sys.version_info[0] >= 3)
37
35
General Comments 0
You need to be logged in to leave comments. Login now