From 9a794fa867d664aaf85a82be2c7fadf2b7d5fe21 Mon Sep 17 00:00:00 2001 From: cookedm Date: Wed, 1 Feb 2006 22:55:38 +0000 Subject: Replace type(a) is (something) with appropiate is_string/is_sequence tests --- numpy/distutils/command/build_scripts.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'numpy/distutils/command/build_scripts.py') diff --git a/numpy/distutils/command/build_scripts.py b/numpy/distutils/command/build_scripts.py index 9a8a6bfa8..c3f3931c3 100644 --- a/numpy/distutils/command/build_scripts.py +++ b/numpy/distutils/command/build_scripts.py @@ -3,6 +3,7 @@ from distutils.command.build_scripts import build_scripts as old_build_scripts from numpy.distutils import log +from numpy.distutils.misc_util import is_string class build_scripts(old_build_scripts): @@ -10,7 +11,7 @@ class build_scripts(old_build_scripts): new_scripts = [] func_scripts = [] for script in scripts: - if type(script) is type(''): + if is_string(script): new_scripts.append(script) else: func_scripts.append(script) @@ -23,12 +24,12 @@ class build_scripts(old_build_scripts): script = func(build_dir) if not script: continue - if type(script) is type([]): - [log.info(" adding '%s' to scripts" % (s)) for s in script] - new_scripts.extend(script) - else: + if is_string(script): log.info(" adding '%s' to scripts" % (script)) new_scripts.append(script) + else: + [log.info(" adding '%s' to scripts" % (s)) for s in script] + new_scripts.extend(list(script)) return new_scripts def run (self): @@ -36,7 +37,7 @@ class build_scripts(old_build_scripts): return self.scripts = self.generate_scripts(self.scripts) - + return old_build_scripts.run(self) def get_source_files(self): -- cgit v1.2.1