grit/gather/chrome_html.py - Issue 15132011: Fix processing newline on unit tests in windows.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: grit/gather/chrome_html.py

Issue 15132011: Fix processing newline on unit tests in windows. (Closed) Base URL: https://chromium.googlesource.com/external/grit-i18n.git@master

Patch Set: Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: grit/gather/chrome_html.py

diff --git a/grit/gather/chrome_html.py b/grit/gather/chrome_html.py

index 60123f07fb7de43d379e966cf9c399bdd2ea1fe1..d5a2b07cd0e61bc44819bf23ac95c7abc1692601 100644

--- a/grit/gather/chrome_html.py

+++ b/grit/gather/chrome_html.py

@@ -38,11 +38,11 @@ _CSS_IMAGE_URLS = lazy_re.compile(

_CSS_IMAGE_SETS = lazy_re.compile(

'(?P<attribute>content|background|[\w-]*-image):[ ]*' +

'-webkit-image-set\((?P<images>' +

- '([,\n ]*url\((?P<quote>"|\'|)[^"\'()]*(?P=quote)\)[ ]*[0-9.]*x)*)\)',

+ '([,\r\n ]*url\((?P<quote>"|\'|)[^"\'()]*(?P=quote)\)[ ]*[0-9.]*x)*)\)',

re.MULTILINE)

# Matches a single image in a CSS image set with the capture group scale.

-_CSS_IMAGE_SET_IMAGE = lazy_re.compile(

- '[,\n ]*url\((?P<quote>"|\'|)[^"\'()]*(?P=quote)\)[ ]*(?P<scale>[0-9.]*x)',

+_CSS_IMAGE_SET_IMAGE = lazy_re.compile('[,\r\n ]*' +

+ 'url\((?P<quote>"|\'|)[^"\'()]*(?P=quote)\)[ ]*(?P<scale>[0-9.]*x)',

re.MULTILINE)

_HTML_IMAGE_SRC = lazy_re.compile(

'<img[^>]+src=\"(?P<filename>[^">]*)\"[^>]*>')

« no previous file with comments | « no previous file | no next file » | no next file with comments »