[Python-checkins] r72372 - in python/branches/py3k: Lib/idlelib/OutputWindow.py

[kurt.kaiser]

Author: kurt.kaiser
Date: Wed May  6 05:23:37 2009
New Revision: 72372

Log:
Merged revisions 72227 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72227 | kurt.kaiser | 2009-05-02 22:05:22 -0400 (Sat, 02 May 2009) | 2 lines
  
  Further development of issue5559, handle Windows files
  which not only have embedded spaces, but leading spaces.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/idlelib/OutputWindow.py

Modified: python/branches/py3k/Lib/idlelib/OutputWindow.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/OutputWindow.py	(original)
+++ python/branches/py3k/Lib/idlelib/OutputWindow.py	Wed May  6 05:23:37 2009
@@ -55,10 +55,12 @@
     ]
 
     file_line_pats = [
+        # order of patterns matters
         r'file "([^"]*)", line (\d+)',
         r'([^\s]+)\((\d+)\)',
-        r'([^\s]+):\s*(\d+):',
-        r'^\s*(\S+.*?):\s*(\d+):',  # Win path with spaces, trim leading spaces
+        r'^(\s*\S.*?):\s*(\d+):',  # Win filename, maybe starting with spaces
+        r'([^\s]+):\s*(\d+):',     # filename or path, ltrim
+        r'^\s*(\S.*?):\s*(\d+):',  # Win abs path with embedded spaces, ltrim
     ]
 
     file_line_progs = None