[Python-checkins] r88091 - in python/branches/release31-maint: Mac/IDLE/idlemain.py

[ned.deily]

Author: ned.deily
Date: Tue Jan 18 06:00:40 2011
New Revision: 88091

Log:
Merged revisions 88007 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88007 | ned.deily | 2011-01-14 21:44:21 -0800 (Fri, 14 Jan 2011) | 5 lines
  
  Remove spurious copy of Mac/IDLE/idlemain.py left over from
  conversion from Python 2 build process.  The correct version
  is in Mac/IDLE/IDLE.app/Contents/Resources/
........


Removed:
   python/branches/release31-maint/Mac/IDLE/idlemain.py
Modified:
   python/branches/release31-maint/   (props changed)

Deleted: python/branches/release31-maint/Mac/IDLE/idlemain.py
==============================================================================
--- python/branches/release31-maint/Mac/IDLE/idlemain.py	Tue Jan 18 06:00:40 2011
+++ (empty file)
@@ -1,30 +0,0 @@
-"""
-Bootstrap script for IDLE as an application bundle.
-"""
-import sys, os
-
-from idlelib.PyShell import main
-
-# Change the current directory the user's home directory, that way we'll get
-# a more useful default location in the open/save dialogs.
-os.chdir(os.path.expanduser('~/Documents'))
-
-
-# Make sure sys.executable points to the python interpreter inside the
-# framework, instead of at the helper executable inside the application
-# bundle (the latter works, but doesn't allow access to the window server)
-if sys.executable.endswith('-32'):
-    sys.executable = os.path.join(sys.prefix, 'bin', 'python-32')
-else:
-    sys.executable = os.path.join(sys.prefix, 'bin', 'python')
-
-# Look for the -psn argument that the launcher adds and remove it, it will
-# only confuse the IDLE startup code.
-for idx, value in enumerate(sys.argv):
-    if value.startswith('-psn_'):
-        del sys.argv[idx]
-        break
-
-#argvemulator.ArgvCollector().mainloop()
-if __name__ == '__main__':
-    main()