tools/grit/grit/node/include.py - Issue 7890060: This broke lots of layout tests on OSX.

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: tools/grit/grit/node/include.py

Issue 7890060: This broke lots of layout tests on OSX. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 3 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:

Index: tools/grit/grit/node/include.py

===================================================================

--- tools/grit/grit/node/include.py (revision 101223)

+++ tools/grit/grit/node/include.py (working copy)

@@ -74,7 +74,7 @@

'''

return self.FilenameToOpen()

- def GetDataPackPair(self, lang, encoding):

+ def GetDataPackPair(self, lang):

'''Returns a (id, string) pair that represents the resource id and raw

bytes of the data. This is used to generate the data pack data file.

'''

@@ -90,8 +90,6 @@

data = infile.read()

infile.close()

- # Include does not care about the encoding, because it only returns binary

- # data.

return id, data

def Flatten(self, output_dir):

@@ -138,3 +136,4 @@

node.EndParsing()

return node

Construct = staticmethod(Construct)

« no previous file with comments | « tools/grit/grit/format/data_pack_unittest.py ('k') | tools/grit/grit/node/message.py » ('j') | no next file with comments »