[Idle-dev] CVS: idle idle,1.11,1.12 idle.py,1.9,1.10 idle.pyw,1.8,1.9

Kurt B. Kaiser kbk@users.sourceforge.net
Sat, 24 May 2003 14:01:41 -0700


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

Modified Files:
	idle idle.py idle.pyw 
Log Message:
Fix a bug in Rev 1.10 - Windows can't handle a leading ':' if the
user's PYTHONPATH is empty (though Linux can).
Modified Files:
	idle idle.py idle.pyw 


Index: idle
===================================================================
RCS file: /cvsroot/idlefork/idle/idle,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** idle	19 May 2003 02:07:44 -0000	1.11
--- idle	24 May 2003 21:01:39 -0000	1.12
***************
*** 15,19 ****
              # We're not in the IDLE directory, help the subprocess find run.py
              pypath = os.environ.get('PYTHONPATH', '')
!             os.environ['PYTHONPATH'] = pypath + ':' + idledir
          PyShell.main()
  else:
--- 15,22 ----
              # We're not in the IDLE directory, help the subprocess find run.py
              pypath = os.environ.get('PYTHONPATH', '')
!             if pypath:
!                 os.environ['PYTHONPATH'] = pypath + ':' + idledir
!             else:
!                 os.environ['PYTHONPATH'] = idledir
          PyShell.main()
  else:

Index: idle.py
===================================================================
RCS file: /cvsroot/idlefork/idle/idle.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** idle.py	19 May 2003 02:07:44 -0000	1.9
--- idle.py	24 May 2003 21:01:39 -0000	1.10
***************
*** 15,19 ****
              # We're not in the IDLE directory, help the subprocess find run.py
              pypath = os.environ.get('PYTHONPATH', '')
!             os.environ['PYTHONPATH'] = pypath + ':' + idledir
          PyShell.main()
  else:
--- 15,22 ----
              # We're not in the IDLE directory, help the subprocess find run.py
              pypath = os.environ.get('PYTHONPATH', '')
!             if pypath:
!                 os.environ['PYTHONPATH'] = pypath + ':' + idledir
!             else:
!                 os.environ['PYTHONPATH'] = idledir
          PyShell.main()
  else:

Index: idle.pyw
===================================================================
RCS file: /cvsroot/idlefork/idle/idle.pyw,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** idle.pyw	19 May 2003 02:07:44 -0000	1.8
--- idle.pyw	24 May 2003 21:01:39 -0000	1.9
***************
*** 13,17 ****
              # We're not in the IDLE directory, help the subprocess find run.py
              pypath = os.environ.get('PYTHONPATH', '')
!             os.environ['PYTHONPATH'] = pypath + ':' + idledir
          PyShell.main()
  else:
--- 13,20 ----
              # We're not in the IDLE directory, help the subprocess find run.py
              pypath = os.environ.get('PYTHONPATH', '')
!             if pypath:
!                 os.environ['PYTHONPATH'] = pypath + ':' + idledir
!             else:
!                 os.environ['PYTHONPATH'] = idledir
          PyShell.main()
  else: