Merged revisions 72227 via svnmerge from

kbkaiser · kbkaiser · commit cef4b81fae5d · 2009-05-06T03:23:37.000Z
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.
........
diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/OutputWindow.py
@@ -55,10 +55,12 @@ def flush(self):
     ]
 
     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

Original file line number	Diff line number	Diff line change
`@@ -55,10 +55,12 @@ def flush(self):`
`55`	`55`	`]`
`56`	`56`
`57`	`57`	`file_line_pats = [`
	`58`	`+ # order of patterns matters`
`58`	`59`	`r'file "([^"]*)", line (\d+)',`
`59`	`60`	`r'([^\s]+)\((\d+)\)',`
`60`		`- r'([^\s]+):\s*(\d+):',`
`61`		`- r'^\s(\S+.?):\s*(\d+):', # Win path with spaces, trim leading spaces`
	`61`	`+ r'^(\s\S.?):\s*(\d+):', # Win filename, maybe starting with spaces`
	`62`	`+ r'([^\s]+):\s*(\d+):', # filename or path, ltrim`
	`63`	`+ r'^\s(\S.?):\s*(\d+):', # Win abs path with embedded spaces, ltrim`
`62`	`64`	`]`
`63`	`65`
`64`	`66`	`file_line_progs = None`