[Python-checkins] cpython (merge 3.2 -> default): Merge

[raymond.hettinger]

http://hg.python.org/cpython/rev/39047f8bd1d1
changeset:   69312:39047f8bd1d1
parent:      69308:ac54877574cb
parent:      69311:dfbbe4c1a7bb
user:        Raymond Hettinger <python at rcn.com>
date:        Tue Apr 12 18:58:40 2011 -0700
summary:
  Merge

files:
  Lib/idlelib/EditorWindow.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -60,7 +60,7 @@
             pass
         else:
             file = None
-            descr = os.path.splitext(filename), None, imp.PY_SOURCE
+            descr = os.path.splitext(filename)[1], None, imp.PY_SOURCE
     return file, filename, descr
 
 class EditorWindow(object):

-- 
Repository URL: http://hg.python.org/cpython