]> granicus.if.org Git - python/commitdiff
Merged revisions 72227 via svnmerge from
authorKurt B. Kaiser <kbk@shore.net>
Wed, 6 May 2009 03:23:37 +0000 (03:23 +0000)
committerKurt B. Kaiser <kbk@shore.net>
Wed, 6 May 2009 03:23:37 +0000 (03:23 +0000)
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.
........

Lib/idlelib/OutputWindow.py

index 5a15873bae837ebd227a5e814f62bdbaba3b9f6e..565cc9b772d8228535e2b131e367dd56b45d2fb2 100644 (file)
@@ -55,10 +55,12 @@ class OutputWindow(EditorWindow):
     ]
 
     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