removed string usage and added a test for _clean

This commit is contained in:
Tarek Ziadé 2009-04-12 17:02:08 +00:00
parent e643bed198
commit 3295eed64b
2 changed files with 22 additions and 4 deletions

View File

@ -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
@ -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)

View File

@ -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)