diff options
Diffstat (limited to 'numpy/distutils/command')
-rw-r--r-- | numpy/distutils/command/build_src.py | 8 | ||||
-rw-r--r-- | numpy/distutils/command/install.py | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py index a9e66e6f4..cacfc472b 100644 --- a/numpy/distutils/command/build_src.py +++ b/numpy/distutils/command/build_src.py @@ -37,7 +37,7 @@ def subst_vars(target, source, d): try: ft = open(target, 'w') try: - for l in fs.readlines(): + for l in fs: m = var.search(l) if m: ft.write(l.replace('@%s@' % m.group(1), d[m.group(1)])) @@ -767,9 +767,8 @@ def get_swig_target(source): def get_swig_modulename(source): f = open(source,'r') - f_readlines = getattr(f,'xreadlines',f.readlines) name = None - for line in f_readlines(): + for line in f: m = _swig_module_name_match(line) if m: name = m.group('name') @@ -794,8 +793,7 @@ _f2py_user_module_name_match = re.compile(r'\s*python\s*module\s*(?P<name>[\w_]* def get_f2py_modulename(source): name = None f = open(source) - f_readlines = getattr(f,'xreadlines',f.readlines) - for line in f_readlines(): + for line in f: m = _f2py_module_name_match(line) if m: if _f2py_user_module_name_match(line): # skip *__user__* names diff --git a/numpy/distutils/command/install.py b/numpy/distutils/command/install.py index ea898ade9..d9b84fc08 100644 --- a/numpy/distutils/command/install.py +++ b/numpy/distutils/command/install.py @@ -64,7 +64,7 @@ class install(old_install): f = open(self.record,'r') lines = [] need_rewrite = False - for l in f.readlines(): + for l in f: l = l.rstrip() if ' ' in l: need_rewrite = True |