diff options
| author | Kurt B. Kaiser <kbk@shore.net> | 2009-05-06 03:23:37 +0000 |
|---|---|---|
| committer | Kurt B. Kaiser <kbk@shore.net> | 2009-05-06 03:23:37 +0000 |
| commit | 4a5ed415365e654acb3c6b6adcc107b8ce20316b (patch) | |
| tree | 3b75f4e425c4428aa4ac02587e0876f93f3515dc /Lib/idlelib/OutputWindow.py | |
| parent | 7394a05679e0cd6cdbf04cc321fd8635192b8679 (diff) | |
| download | cpython-4a5ed415365e654acb3c6b6adcc107b8ce20316b.tar.gz | |
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/OutputWindow.py')
| -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 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 |