grit/node/misc.py - Issue 1212703002: grit: Ignore empty file paths when generating input file list

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/node/misc.py

Issue 1212703002: grit: Ignore empty file paths when generating input file list (Closed) Base URL: https://chromium.googlesource.com/external/grit-i18n.git@master

Patch Set: replace backslash in Win paths Created 5 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/node/misc.py

diff --git a/grit/node/misc.py b/grit/node/misc.py

index 8a0b46f53de370b0c2fe8f0f7978f3b43b402c06..7f450188fc75d48e73bb5d40b4e2e78c69d25b4e 100755

--- a/grit/node/misc.py

+++ b/grit/node/misc.py

@@ -331,7 +331,9 @@ class GritNode(base.Node):

for node in self.ActiveDescendants():

if isinstance(node, (io.FileNode, include.IncludeNode, misc.PartNode,

structure.StructureNode, variant.SkeletonNode)):

- input_files.add(node.GetInputPath())

+ input_path = node.GetInputPath()

+ if input_path is not None:

+ input_files.add(input_path)

self.SetOutputLanguage(old_output_language)

return sorted(map(self.ToRealPath, input_files))

« no previous file with comments | « no previous file | grit/node/misc_unittest.py » ('j') | grit/node/misc_unittest.py » ('J')