[Python-checkins] r72227 - python/trunk/Lib/idlelib/OutputWindow.py

[kurt.kaiser]

Author: kurt.kaiser
Date: Sun May  3 04:05:22 2009
New Revision: 72227

Log:
Further development of issue5559, handle Windows files
which not only have embedded spaces, but leading spaces.

Modified:
   python/trunk/Lib/idlelib/OutputWindow.py

Modified: python/trunk/Lib/idlelib/OutputWindow.py
==============================================================================
--- python/trunk/Lib/idlelib/OutputWindow.py	(original)
+++ python/trunk/Lib/idlelib/OutputWindow.py	Sun May  3 04:05:22 2009
@@ -60,10 +60,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