From 80344dee5ede5c36a56adfaa9ef5638a6ea7b6fa Mon Sep 17 00:00:00 2001 From: Thomas Nagy Date: Tue, 3 Mar 2015 12:19:25 +0100 Subject: [PATCH] Use splitlines when possible --- docs/book/examples/scenarios_unknown/evil_comp.py | 2 +- playground/gtest/wscript | 2 +- waflib/Tools/c_config.py | 2 +- waflib/Tools/gfortran.py | 2 +- waflib/extras/color_gcc.py | 2 +- waflib/extras/color_rvct.py | 2 +- waflib/extras/cppcheck.py | 2 +- waflib/extras/fc_pgfortran.py | 2 +- waflib/extras/protoc.py | 2 +- wscript | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/book/examples/scenarios_unknown/evil_comp.py b/docs/book/examples/scenarios_unknown/evil_comp.py index 2d2ed21e..84769daf 100755 --- a/docs/book/examples/scenarios_unknown/evil_comp.py +++ b/docs/book/examples/scenarios_unknown/evil_comp.py @@ -22,7 +22,7 @@ file = open(name, 'r') txt = file.read() file.close() -lst = txt.split('\n') +lst = txt.splitlines() for line in lst: source_filename = line.strip() if not source_filename: continue diff --git a/playground/gtest/wscript b/playground/gtest/wscript index 17e16b08..5919f3ca 100644 --- a/playground/gtest/wscript +++ b/playground/gtest/wscript @@ -35,7 +35,7 @@ def gtest_results(bld): # uncomment if you want to see what's happening # print(str(out, 'utf-8')) - output = str(out, 'utf-8').split('\n') + output = str(out, 'utf-8').splitlines() for i, line in enumerate(output): if '[ RUN ]' in line and code: i += 1 diff --git a/waflib/Tools/c_config.py b/waflib/Tools/c_config.py index 736d5403..ea171b1a 100755 --- a/waflib/Tools/c_config.py +++ b/waflib/Tools/c_config.py @@ -1093,7 +1093,7 @@ def get_suncc_version(conf, cc): err = e.stderr version = (out or err) - version = version.split('\n')[0] + version = version.splitlines()[0] version_re = re.compile(r'cc:\s+sun\s+(c\+\+|c)\s+(?P\d*)\.(?P\d*)', re.I).search match = version_re(version) diff --git a/waflib/Tools/gfortran.py b/waflib/Tools/gfortran.py index e615338c..06d039c2 100644 --- a/waflib/Tools/gfortran.py +++ b/waflib/Tools/gfortran.py @@ -63,7 +63,7 @@ def get_gfortran_version(conf, fc): conf.fatal('Could not determine the compiler type') k = {} - out = out.split('\n') + out = out.splitlines() import shlex for line in out: diff --git a/waflib/extras/color_gcc.py b/waflib/extras/color_gcc.py index c1eaedf5..71842405 100644 --- a/waflib/extras/color_gcc.py +++ b/waflib/extras/color_gcc.py @@ -21,7 +21,7 @@ class ColorGCCFormatter(Logs.formatter): cmd = frame.f_locals['cmd'] if isinstance(cmd, list) and ('gcc' in cmd[0] or 'g++' in cmd[0]): lines = [] - for line in rec.msg.split('\n'): + for line in rec.msg.splitlines(): if 'warning: ' in line: lines.append(self.colors.YELLOW + line) elif 'error: ' in line: diff --git a/waflib/extras/color_rvct.py b/waflib/extras/color_rvct.py index 3cb4856f..f89ccbdb 100644 --- a/waflib/extras/color_rvct.py +++ b/waflib/extras/color_rvct.py @@ -32,7 +32,7 @@ class RcvtFormatter(Logs.formatter): cmd = frame.f_locals['cmd'] if isinstance(cmd, list) and ('armcc' in cmd[0] or 'armld' in cmd[0]): lines = [] - for line in rec.msg.split('\n'): + for line in rec.msg.splitlines(): if 'Warning: ' in line: lines.append(self.colors.YELLOW + line) elif 'Error: ' in line: diff --git a/waflib/extras/cppcheck.py b/waflib/extras/cppcheck.py index d3915c63..c60f9fab 100644 --- a/waflib/extras/cppcheck.py +++ b/waflib/extras/cppcheck.py @@ -211,7 +211,7 @@ class cppcheck(Task.Task): '''use cppcheck xml result string, add the command string used to invoke cppcheck and save as xml file. ''' - header = '%s\n' % s.split('\n')[0] + header = '%s\n' % s.splitlines()[0] root = ElementTree.fromstring(s) cmd = ElementTree.SubElement(root.find('cppcheck'), 'cmd') cmd.text = str(self.cmd) diff --git a/waflib/extras/fc_pgfortran.py b/waflib/extras/fc_pgfortran.py index 2ec81281..f478d03e 100644 --- a/waflib/extras/fc_pgfortran.py +++ b/waflib/extras/fc_pgfortran.py @@ -41,7 +41,7 @@ def get_pgfortran_version(conf,fc): conf.fatal('Could not determine the compiler type') k = {} prevk = '' - out = out.split('\n') + out = out.splitlines() for line in out: lst = line.partition('=') if lst[1] == '=': diff --git a/waflib/extras/protoc.py b/waflib/extras/protoc.py index e92e65df..f8fd070f 100644 --- a/waflib/extras/protoc.py +++ b/waflib/extras/protoc.py @@ -57,7 +57,7 @@ class protoc(Task): if node in seen: return seen.append(node) - code = node.read().split("\n") + code = node.read().splitlines() for line in code: m = re.search(r'^import\s+"(.*)";.*(//)?.*', line) if m: diff --git a/wscript b/wscript index ff494594..38e08e1e 100644 --- a/wscript +++ b/wscript @@ -188,7 +188,7 @@ def process_tokens(tokens): deco_re = re.compile('(def|class)\\s+(\w+)\\(.*') def process_decorators(body): - lst = body.split('\n') + lst = body.splitlines() accu = [] all_deco = [] buf = [] # put the decorator lines