From: Kurt B. Kaiser Date: Wed, 6 May 2009 03:23:37 +0000 (+0000) Subject: Merged revisions 72227 via svnmerge from X-Git-Tag: v3.1b1~15 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cef4b81fae5dd90a0c00b04412c3a8ea03064326;p=python 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. ........ --- diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/OutputWindow.py index 5a15873bae..565cc9b772 100644 --- a/Lib/idlelib/OutputWindow.py +++ b/Lib/idlelib/OutputWindow.py @@ -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