[Idle-dev] CVS: idle idle,1.8,1.9 idle.py,1.6,1.7 idle.pyw,1.5,1.6

[Kurt B. Kaiser]

Update of /cvsroot/idlefork/idle
In directory sc8-pr-cvs1:/tmp/cvs-serv15100

Modified Files:
	idle idle.py idle.pyw 
Log Message:
Improve exception handling.


Index: idle
===================================================================
RCS file: /cvsroot/idlefork/idle/idle,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** idle	31 Dec 2002 23:18:00 -0000	1.8
--- idle	2 Jan 2003 17:09:34 -0000	1.9
***************
*** 3,9 ****
  try:
      import idlelib.PyShell
-     idlelib.PyShell.main()
  except ImportError:
      # IDLE is not installed, but maybe PyShell is on sys.path:
      import PyShell
      PyShell.main()
--- 3,10 ----
  try:
      import idlelib.PyShell
  except ImportError:
      # IDLE is not installed, but maybe PyShell is on sys.path:
      import PyShell
      PyShell.main()
+ else:
+     idlelib.PyShell.main()

Index: idle.py
===================================================================
RCS file: /cvsroot/idlefork/idle/idle.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** idle.py	31 Dec 2002 23:18:00 -0000	1.6
--- idle.py	2 Jan 2003 17:09:34 -0000	1.7
***************
*** 3,9 ****
  try:
      import idlelib.PyShell
-     idlelib.PyShell.main()
  except ImportError:
      # IDLE is not installed, but maybe PyShell is on sys.path:
      import PyShell
      PyShell.main()
--- 3,10 ----
  try:
      import idlelib.PyShell
  except ImportError:
      # IDLE is not installed, but maybe PyShell is on sys.path:
      import PyShell
      PyShell.main()
+ else:
+     idlelib.PyShell.main()

Index: idle.pyw
===================================================================
RCS file: /cvsroot/idlefork/idle/idle.pyw,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** idle.pyw	31 Dec 2002 23:18:00 -0000	1.5
--- idle.pyw	2 Jan 2003 17:09:34 -0000	1.6
***************
*** 3,9 ****
  try:
      import idlelib.PyShell
-     idlelib.PyShell.main()
  except ImportError:
      # IDLE is not installed, but maybe PyShell is on sys.path:
      import PyShell
      PyShell.main()
--- 3,10 ----
  try:
      import idlelib.PyShell
  except ImportError:
      # IDLE is not installed, but maybe PyShell is on sys.path:
      import PyShell
      PyShell.main()
+ else:
+     idlelib.PyShell.main()