From: Kurt B. Kaiser <kbk@shore.net>
Date: Sun, 3 May 2009 02:05:22 +0000 (+0000)
Subject: Further development of issue5559, handle Windows files
X-Git-Tag: v2.7a1~1305
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62e9a653b5d61536ab397573ba5133ddcca80f26;p=python

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
index a243a2d976..f6b379b9a6 100644
--- a/Lib/idlelib/OutputWindow.py
+++ b/Lib/idlelib/OutputWindow.py
@@ -60,10 +60,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