[Python-checkins] r69726 - in python/branches/py3k: Lib/distutils/command/sdist.py Lib/distutils/tests/test_sdist.py Misc/ACKS

Wed Feb 18 00:10:20 CET 2009

Author: tarek.ziade
Date: Wed Feb 18 00:10:18 2009
New Revision: 69726
Log:
Merged revisions 69724 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r69724 | tarek.ziade | 2009年02月18日 00:06:51 +0100 (2009年2月18日) | 1 line
 
 fixed the data_files inclusion behavior
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Lib/distutils/command/sdist.py
 python/branches/py3k/Lib/distutils/tests/test_sdist.py
 python/branches/py3k/Misc/ACKS
Modified: python/branches/py3k/Lib/distutils/command/sdist.py
==============================================================================

--- python/branches/py3k/Lib/distutils/command/sdist.py	(original)
+++ python/branches/py3k/Lib/distutils/command/sdist.py	Wed Feb 18 00:10:18 2009
@@ -311,7 +311,7 @@
 else: # a (dirname, filenames) tuple
 dirname, filenames = item
 for f in filenames:
- f = convert_path(os.path.join(dirname, f))
+ f = convert_path(f)
 if os.path.isfile(f):
 self.filelist.append(f)
 
Modified: python/branches/py3k/Lib/distutils/tests/test_sdist.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_sdist.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_sdist.py	Wed Feb 18 00:10:18 2009
@@ -23,6 +23,7 @@
 
 MANIFEST = """\
 README
+inroot.txt
 setup.py
 data%(sep)sdata.dt
 scripts%(sep)sscript.py
@@ -171,10 +172,13 @@
 self.write_file((data_dir, 'data.dt'), '#')
 some_dir = join(self.tmp_dir, 'some')
 os.mkdir(some_dir)
+ self.write_file((self.tmp_dir, 'inroot.txt'), '#')
 self.write_file((some_dir, '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/other_file.txt']
 
@@ -202,7 +206,7 @@
 zip_file.close()
 
 # making sure everything was added
- self.assertEquals(len(content), 10)
+ self.assertEquals(len(content), 11)
 
 # checking the MANIFEST
 manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
Modified: python/branches/py3k/Misc/ACKS
==============================================================================
--- python/branches/py3k/Misc/ACKS	(original)
+++ python/branches/py3k/Misc/ACKS	Wed Feb 18 00:10:18 2009
@@ -613,6 +613,7 @@
 Mark Russell
 Nick Russo
 Hajime Saitou
+George Sakkis
 Rich Salz
 Kevin Samborn
 Ilya Sandler
