Merge PR #1143 (Python3 StartMenu items)

Start Menu items are now installed with bdist_wininst on Python 3.

closes  #1143

IPython/zmq/completer.py

@@ -5,7 +5,10 b''
 from __future__ import print_function
 
 import itertools
-import readline
+try:
+    import readline
+except ImportError:
+    readline = None
 import rlcompleter
 import time
 
@@ -37,8 +40,9 b' class ClientCompleter(object):'
     and then return them for each value of state."""
     
     def __init__(self, client, session, socket):
-         # ugly, but we get called asynchronously and need access to some
-         # client state, like backgrounded code
+        # ugly, but we get called asynchronously and need access to some
+        # client state, like backgrounded code
+        assert readline is not None, "ClientCompleter depends on readline"
         self.client = client
         self.session = session
         self.socket = socket

scripts/ipython_win_post_install.py

@@ -1,6 +1,8 b''
 #!python
 """Windows-specific part of the installation"""
 
+from __future__ import print_function
+
 import os, sys, shutil
 pjoin = os.path.join
 
@@ -17,12 +19,15 b' def mkshortcut(target,description,link_file,*args,**kw):'
     create_shortcut(target, description, link_file,*args,**kw)
     file_created(link_file)
 
+def suffix(s):
+    """add '3' suffix to programs for Python 3"""
+    if sys.version_info[0] == 3:
+        s = s+'3'
+    return s
 
 def install():
     """Routine to be run by the win32 installer with the -install switch."""
     
-    from IPython.core.release import version
-    
     # Get some system constants
     prefix = sys.prefix
     python = pjoin(prefix, 'python.exe')
@@ -55,6 +60,7 b' def install():'
         'ipcluster',
         'irunner'
     ]
+    programs = [ suffix(p) for p in programs ]
     scripts = pjoin(prefix,'scripts')
     if not have_setuptools:
         # only create .bat files if we don't have setuptools
@@ -70,7 +76,7 b' def install():'
             bat_file.close()
 
     # Now move onto setting the Start Menu up
-    ipybase = pjoin(scripts, 'ipython')
+    ipybase = suffix(pjoin(scripts, 'ipython'))
     if have_setuptools:
         # let setuptools take care of the scripts:
         ipybase = ipybase + '-script.py'
@@ -93,21 +99,21 b' def install():'
     mkshortcut(python, 'IPython (pylab profile)', link, cmd, workdir)
         
     link = pjoin(ip_start_menu, 'ipcontroller.lnk')
-    cmdbase = pjoin(scripts, 'ipcontroller')
+    cmdbase = suffix(pjoin(scripts, 'ipcontroller'))
     if have_setuptools:
         cmdbase += '-script.py'
     cmd = '"%s"' % cmdbase
     mkshortcut(python, 'IPython controller', link, cmd, workdir)
     
     link = pjoin(ip_start_menu, 'ipengine.lnk')
-    cmdbase = pjoin(scripts, 'ipengine')
+    cmdbase = suffix(pjoin(scripts, 'ipengine'))
     if have_setuptools:
         cmdbase += '-script.py'
     cmd = '"%s"' % cmdbase
     mkshortcut(python, 'IPython engine', link, cmd, workdir)
 
     link = pjoin(ip_start_menu, 'ipythonqt.lnk')
-    cmdbase = pjoin(scripts, 'ipython-qtconsole')
+    cmdbase = suffix(pjoin(scripts, 'ipython')) + '-qtconsole'
     if have_setuptools:
         cmdbase += '-script.pyw'
     cmd = '"%s"' % cmdbase
@@ -126,8 +132,11 b' def remove():'
 # main()
 if len(sys.argv) > 1:
     if sys.argv[1] == '-install':
-        install()
+        try:
+            install()
+        except OSError:
+            print("Failed to create Start Menu items, try running installer as administrator.", file=sys.stderr)
     elif sys.argv[1] == '-remove':
         remove()
     else:
-        print "Script was called with option %s" % sys.argv[1]
+        print("Script was called with option %s" % sys.argv[1], file=sys.stderr)

setup3.py

@@ -1,4 +1,5 b''
 import os.path
+import sys
 from setuptools import setup
 from setuptools.command.build_py import build_py
 
@@ -14,6 +15,20 b" setup_args['packages'] = find_packages()"
 setup_args['package_data'] = find_package_data()
 setup_args['cmdclass'] = {'build_py': record_commit_info('IPython', build_cmd=build_py)}
 
+# Script to be run by the windows binary installer after the default setup
+# routine, to add shortcuts and similar windows-only things.  Windows
+# post-install scripts MUST reside in the scripts/ dir, otherwise distutils
+# doesn't find them.
+if 'bdist_wininst' in sys.argv:
+    if len(sys.argv) > 2 and \
+           ('sdist' in sys.argv or 'bdist_rpm' in sys.argv):
+        print >> sys.stderr, "ERROR: bdist_wininst must be run alone. Exiting."
+        sys.exit(1)
+    setup_args['scripts'] = [os.path.join('scripts','ipython_win_post_install.py')]
+    setup_args['options'] = {"bdist_wininst":
+                             {"install_script":
+                              "ipython_win_post_install.py"}}
+
 def main():
     setup(use_2to3 = True, **setup_args)