mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-17 14:16:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 69724 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r69724 | tarek.ziade | 2009-02-18 00:06:51 +0100 (Wed, 18 Feb 2009) | 1 line

  fixed the data_files inclusion behavior
........
This commit is contained in:
Tarek Ziadé 2009-02-17 23:10:18 +00:00
parent acd82b99c8
commit 14d34a0e43
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/distutils/command/sdist.py
View file

@ -311,7 +311,7 @@ class sdist (Command):
else: # a (dirname, filenames) tuple else: # a (dirname, filenames) tuple
dirname, filenames = item dirname, filenames = item
for f in filenames: for f in filenames:
f = convert_path(os.path.join(dirname, f)) f = convert_path(f)
if os.path.isfile(f): if os.path.isfile(f):
self.filelist.append(f) self.filelist.append(f)

8
Lib/distutils/tests/test_sdist.py
View file

@ -23,6 +23,7 @@ setup(name='fake')
MANIFEST = """\ MANIFEST = """\
README README
inroot.txt
setup.py setup.py
data%(sep)sdata.dt data%(sep)sdata.dt
scripts%(sep)sscript.py scripts%(sep)sscript.py
@ -171,10 +172,13 @@ class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
self.write_file((data_dir, 'data.dt'), '#') self.write_file((data_dir, 'data.dt'), '#')
some_dir = join(self.tmp_dir, 'some') some_dir = join(self.tmp_dir, 'some')
os.mkdir(some_dir) os.mkdir(some_dir)
self.write_file((self.tmp_dir, 'inroot.txt'), '#')
self.write_file((some_dir, 'file.txt'), '#') self.write_file((some_dir, 'file.txt'), '#')
self.write_file((some_dir, 'other_file.txt'), '#') self.write_file((some_dir, 'other_file.txt'), '#')
dist.data_files = [('data', ['data.dt', 'notexisting']), dist.data_files = [('data', ['data/data.dt',
'inroot.txt',
'notexisting']),
'some/file.txt', 'some/file.txt',
'some/other_file.txt'] 'some/other_file.txt']
@ -202,7 +206,7 @@ class sdistTestCase(support.LoggingSilencer, PyPIRCCommandTestCase):
zip_file.close() zip_file.close()
# making sure everything was added # making sure everything was added
self.assertEquals(len(content), 10) self.assertEquals(len(content), 11)
# checking the MANIFEST # checking the MANIFEST
manifest = open(join(self.tmp_dir, 'MANIFEST')).read() manifest = open(join(self.tmp_dir, 'MANIFEST')).read()

1
Misc/ACKS
View file

@ -613,6 +613,7 @@ Sam Rushing
Mark Russell Mark Russell
Nick Russo Nick Russo
Hajime Saitou Hajime Saitou
George Sakkis
Rich Salz Rich Salz
Kevin Samborn Kevin Samborn
Ilya Sandler Ilya Sandler