summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorKurt B. Kaiser <kbk@shore.net>2009-05-03 02:05:22 (GMT)
committerKurt B. Kaiser <kbk@shore.net>2009-05-03 02:05:22 (GMT)
commit62e9a653b5d61536ab397573ba5133ddcca80f26 (patch)
tree0aebbed99a5a8645e0fd897d3155f7de5d06ddc5 /Lib
parent106ac46b3fb4751fb19a0e7b429c7ad3f71dc345 (diff)
downloadcpython-62e9a653b5d61536ab397573ba5133ddcca80f26.zip
cpython-62e9a653b5d61536ab397573ba5133ddcca80f26.tar.gz
cpython-62e9a653b5d61536ab397573ba5133ddcca80f26.tar.bz2
Further development of issue5559, handle Windows files
which not only have embedded spaces, but leading spaces.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/idlelib/OutputWindow.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/OutputWindow.py
index a243a2d..f6b379b 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