[Python-checkins] CVS: python/dist/src/Tools/idle PyShell.py,1.29,1.30

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Tools/idle
In directory slayer.i.sourceforge.net:/tmp/cvs-serv28189/Tools/idle

Modified Files:
	PyShell.py 
Log Message:

main():  Move hackery of sys.argv until after the Tk instance has been
         created.  This allows the application-specific Tkinter
         initialization to be executed if present.  Also pass an explicit
         className parameter to the Tk() constructor.

This closes SourceForge bug #110618.


Index: PyShell.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/idle/PyShell.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** PyShell.py	2000/09/05 13:51:14	1.29
--- PyShell.py	2000/09/15 04:32:56	1.30
***************
*** 713,722 ****
              PyShell.shell_title = a
  
-     if not edit:
-         if cmd:
-             sys.argv = ["-c"] + args
-         else:
-             sys.argv = args or [""]
- 
      for i in range(len(sys.path)):
          sys.path[i] = os.path.abspath(sys.path[i])
--- 713,716 ----
***************
*** 736,740 ****
  
      global flist, root
!     root = Tk()
      fixwordbreaks(root)
      root.withdraw()
--- 730,734 ----
  
      global flist, root
!     root = Tk(className="Idle")
      fixwordbreaks(root)
      root.withdraw()
***************
*** 744,747 ****
--- 738,747 ----
          for filename in args:
              flist.open(filename)
+     else:
+         if cmd:
+             sys.argv = ["-c"] + args
+         else:
+             sys.argv = args or [""]
+ 
  
      shell = PyShell(flist)