summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2007-08-26 23:37:53 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2007-08-26 23:37:53 (GMT)
commitd082b6eaace23486a2e5a027d6ac1b3cd253e8ee (patch)
tree22009fcc3f2d45d6d1b97949aad7416ca7bb7a11 /Lib
parent19b4a272eae85ab597e38ba45b6f8540134e9e7d (diff)
downloadcpython-d082b6eaace23486a2e5a027d6ac1b3cd253e8ee.zip
cpython-d082b6eaace23486a2e5a027d6ac1b3cd253e8ee.tar.gz
cpython-d082b6eaace23486a2e5a027d6ac1b3cd253e8ee.tar.bz2
os.getcwd() now returns a normal string (ie, unicode)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/idlelib/PyShell.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index 21cdbc5..6ec6251 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -1365,11 +1365,8 @@ def main():
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',