[Python-3000-checkins] r57532 - python/branches/py3k/Lib/idlelib/PyShell.py

neal.norwitz python-3000-checkins at python.org
Mon Aug 27 01:37:53 CEST 2007


Author: neal.norwitz
Date: Mon Aug 27 01:37:53 2007
New Revision: 57532

Modified:
   python/branches/py3k/Lib/idlelib/PyShell.py
Log:
os.getcwd() now returns a normal string (ie, unicode)

Modified: python/branches/py3k/Lib/idlelib/PyShell.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/PyShell.py	(original)
+++ python/branches/py3k/Lib/idlelib/PyShell.py	Mon Aug 27 01:37:53 2007
@@ -1365,11 +1365,8 @@
             if not dir in sys.path:
                 sys.path.insert(0, dir)
     else:
-        dir = str(os.getcwd()) ### os.getcwd() returning str8 but sys.path
-                               ### items are type 'str'. Remove the cast
-                               ### when fixed and assertion fails
-        assert isinstance(os.getcwd(), str8)  ###
-        if not dir in sys.path:
+        dir = os.getcwd()
+        if dir not in sys.path:
             sys.path.insert(0, dir)
     # check the IDLE settings configuration (but command line overrides)
     edit_start = idleConf.GetOption('main', 'General',


More information about the Python-3000-checkins mailing list