diff options
| -rw-r--r-- | Lib/distutils/command/config.py | 8 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_config_cmd.py | 18 |
2 files changed, 22 insertions, 4 deletions
diff --git a/Lib/distutils/command/config.py b/Lib/distutils/command/config.py index f2ebe37..134fa38 100644 --- a/Lib/distutils/command/config.py +++ b/Lib/distutils/command/config.py @@ -11,7 +11,7 @@ this header file lives". __revision__ = "$Id$" -import sys, os, string, re +import sys, os, re from distutils.core import Command from distutils.errors import DistutilsExecError @@ -81,7 +81,7 @@ class config(Command): elif isinstance(self.library_dirs, str): self.library_dirs = self.library_dirs.split(os.pathsep) - def run (self): + def run(self): pass @@ -156,7 +156,7 @@ class config(Command): if not filenames: filenames = self.temp_files self.temp_files = [] - log.info("removing: %s", string.join(filenames)) + log.info("removing: %s", ' '.join(filenames)) for filename in filenames: try: os.remove(filename) @@ -308,7 +308,7 @@ class config(Command): else: body.append(" %s;" % func) body.append("}") - body = string.join(body, "\n") + "\n" + body = "\n".join(body) + "\n" return self.try_link(body, headers, include_dirs, libraries, library_dirs) diff --git a/Lib/distutils/tests/test_config_cmd.py b/Lib/distutils/tests/test_config_cmd.py index 45d480b..f5c09e4 100644 --- a/Lib/distutils/tests/test_config_cmd.py +++ b/Lib/distutils/tests/test_config_cmd.py @@ -60,6 +60,24 @@ class ConfigTestCase(support.LoggingSilencer, self.assertEquals(cmd.libraries, ['one']) self.assertEquals(cmd.library_dirs, ['three', 'four']) + def test_clean(self): + # _clean removes files + tmp_dir = self.mkdtemp() + f1 = os.path.join(tmp_dir, 'one') + f2 = os.path.join(tmp_dir, 'two') + + self.write_file(f1, 'xxx') + self.write_file(f2, 'xxx') + + for f in (f1, f2): + self.assert_(os.path.exists(f)) + + pkg_dir, dist = self.create_dist() + cmd = config(dist) + cmd._clean(f1, f2) + + for f in (f1, f2): + self.assert_(not os.path.exists(f)) def test_suite(): return unittest.makeSuite(ConfigTestCase) |