Always read line-by-line with mode rU

This commit is contained in:
Tom Payne
2014-02-23 13:50:54 +01:00
parent 1d2c88efb9
commit 3aedca7bd6
4 changed files with 10 additions and 10 deletions

View File

@@ -8,7 +8,7 @@ def main(argv):
examples = {} examples = {}
requires = set() requires = set()
for filename in argv[1:]: for filename in argv[1:]:
lines = open(filename).readlines() lines = open(filename, 'rU').readlines()
if len(lines) > 0 and lines[0].startswith('// NOCOMPILE'): if len(lines) > 0 and lines[0].startswith('// NOCOMPILE'):
continue continue
requires.update(line for line in lines if line.startswith('goog.require')) requires.update(line for line in lines if line.startswith('goog.require'))

View File

@@ -113,7 +113,7 @@ def main(argv):
for arg in args: for arg in args:
in_comment = False in_comment = False
object_literal = None object_literal = None
for line in open(arg): for line in open(arg, 'rU'):
line = line.strip() line = line.strip()
if not line: if not line:
continue continue

View File

@@ -52,7 +52,7 @@ def main(argv):
common, vertex, fragment = [], [], [] common, vertex, fragment = [], [], []
attributes, uniforms, varyings = {}, {}, {} attributes, uniforms, varyings = {}, {}, {}
block = None block = None
for line in open(options.input): for line in open(options.input, 'rU'):
if line.startswith('//!'): if line.startswith('//!'):
m = re.match(r'//!\s+NAMESPACE=(\S+)\s*\Z', line) m = re.match(r'//!\s+NAMESPACE=(\S+)\s*\Z', line)
if m: if m:

View File

@@ -251,7 +251,7 @@ for glsl_src in GLSL_SRC:
def _build_require_list(dependencies, output_file_name): def _build_require_list(dependencies, output_file_name):
requires = set() requires = set()
for dependency in dependencies: for dependency in dependencies:
for line in open(dependency): for line in open(dependency, 'rU'):
match = re.match(r'goog\.provide\(\'(.*)\'\);', line) match = re.match(r'goog\.provide\(\'(.*)\'\);', line)
if match: if match:
requires.add(match.group(1)) requires.add(match.group(1))
@@ -449,7 +449,7 @@ def build_check_requires_timestamp(t):
# the generated regular expression to exceed Python's limits # the generated regular expression to exceed Python's limits
if zi.filename.startswith('closure/goog/i18n/'): if zi.filename.startswith('closure/goog/i18n/'):
continue continue
for line in zf.open(zi): for line in zf.open(zi, 'rU'):
m = re.match(r'goog.provide\(\'(.*)\'\);', line) m = re.match(r'goog.provide\(\'(.*)\'\);', line)
if m: if m:
all_provides.add(m.group(1)) all_provides.add(m.group(1))
@@ -458,7 +458,7 @@ def build_check_requires_timestamp(t):
continue continue
require_linenos = {} require_linenos = {}
uses = set() uses = set()
lines = open(filename).readlines() lines = open(filename, 'rU').readlines()
for lineno, line in _strip_comments(lines): for lineno, line in _strip_comments(lines):
m = re.match(r'goog.provide\(\'(.*)\'\);', line) m = re.match(r'goog.provide\(\'(.*)\'\);', line)
if m: if m:
@@ -541,7 +541,7 @@ def build_check_requires_timestamp(t):
requires = set() requires = set()
uses = set() uses = set()
uses_linenos = {} uses_linenos = {}
for lineno, line in _strip_comments(open(filename)): for lineno, line in _strip_comments(open(filename, 'rU')):
m = re.match(r'goog.provide\(\'(.*)\'\);', line) m = re.match(r'goog.provide\(\'(.*)\'\);', line)
if m: if m:
provides.add(m.group(1)) provides.add(m.group(1))
@@ -590,7 +590,7 @@ def build_check_whitespace_timestamp(t):
errors = 0 errors = 0
for filename in sorted(t.newer(t.dependencies)): for filename in sorted(t.newer(t.dependencies)):
whitespace = False whitespace = False
for lineno, line in enumerate(open(filename)): for lineno, line in enumerate(open(filename, 'rU')):
if CR_RE.search(line): if CR_RE.search(line):
t.info('%s:%d: carriage return character in line', filename, lineno + 1) t.info('%s:%d: carriage return character in line', filename, lineno + 1)
errors += 1 errors += 1
@@ -633,7 +633,7 @@ def jsdoc_BRANCH_timestamp(t):
def split_example_file(example, dst_dir): def split_example_file(example, dst_dir):
lines = open(example).readlines() lines = open(example, 'rU').readlines()
target_lines = [] target_lines = []
target_require_lines = [] target_require_lines = []
@@ -709,7 +709,7 @@ def host_examples(t):
def check_examples(t): def check_examples(t):
examples = ['build/hosted/%(BRANCH)s/' + e examples = ['build/hosted/%(BRANCH)s/' + e
for e in EXAMPLES for e in EXAMPLES
if not open(e.replace('.html', '.js')).readline().startswith('// NOCOMPILE')] if not open(e.replace('.html', '.js'), 'rU').readline().startswith('// NOCOMPILE')]
all_examples = \ all_examples = \
[e + '?mode=advanced' for e in examples] [e + '?mode=advanced' for e in examples]
for example in all_examples: for example in all_examples: