grit/format/html_inline.py - Issue 18568003: Fix LINK and INCLUDE HTML inlining Regexes to Support End Tags on Different Lines

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/format/html_inline.py

Issue 18568003: Fix LINK and INCLUDE HTML inlining Regexes to Support End Tags on Different Lines (Closed) Base URL: https://grit-i18n.googlecode.com/svn/trunk

Patch Set: Created 7 years, 6 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/format/html_inline.py

diff --git a/grit/format/html_inline.py b/grit/format/html_inline.py

index b5e0b0fbb65c6060e15dc0db94c6c87bce130180..589e49b6a94f93a8c9b81c973338643b8803272e 100755

--- a/grit/format/html_inline.py

+++ b/grit/format/html_inline.py

@@ -32,11 +32,11 @@ _END_IF_BLOCK = lazy_re.compile('\s*</if>')

# Used by DoInline to replace various links with inline content.

_STYLESHEET_RE = lazy_re.compile(

- '<link rel="stylesheet"[^>]+?href="(?P<filename>[^"]*)".*?>',

- re.MULTILINE)

+ '<link rel="stylesheet"[^>]+?href="(?P<filename>[^"]*)".*?>(\s*</link>)?',

+ re.DOTALL)

_INCLUDE_RE = lazy_re.compile(

- '<include[^>]+?src="(?P<filename>[^"\']*)".*>',

- re.MULTILINE)

+ '<include[^>]+?src="(?P<filename>[^"\']*)".*?>(\s*</include>)?',

+ re.DOTALL)

_SRC_RE = lazy_re.compile(

r'<(?!script)(?:[^>]+?\s)src=(?P<quote>")(?P<filename>[^"\']*)\1',

re.MULTILINE)

« no previous file with comments | « no previous file | grit/format/html_inline_unittest.py » ('j') | no next file with comments »