diff options
| author | Kurt B. Kaiser <kbk@shore.net> | 2009-05-06 03:23:37 (GMT) |
|---|---|---|
| committer | Kurt B. Kaiser <kbk@shore.net> | 2009-05-06 03:23:37 (GMT) |
| commit | cef4b81fae5dd90a0c00b04412c3a8ea03064326 (patch) | |
| tree | 2f5e2cb20e806caeeb2ccc9e48146248d40ba654 /Lib/idlelib | |
| parent | 81c447f4d89273e629f42238d7714b7547aa21de (diff) | |
| download | cpython-cef4b81fae5dd90a0c00b04412c3a8ea03064326.zip cpython-cef4b81fae5dd90a0c00b04412c3a8ea03064326.tar.gz cpython-cef4b81fae5dd90a0c00b04412c3a8ea03064326.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/OutputWindow.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/OutputWindow.py index 5a15873..565cc9b 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 |