summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNadeem Vawda <nadeem.vawda@gmail.com>2011-08-21 20:35:41 (GMT)
committerNadeem Vawda <nadeem.vawda@gmail.com>2011-08-21 20:35:41 (GMT)
commit3d3bc8121915968ee8e445299800914b5a46da3a (patch)
tree9e1102ac3a7d85f7a2327990dfeda1bef46d562a
parent8c973189b59ffd49ec5204e0afc3afed4654c7c8 (diff)
downloadcpython-3d3bc8121915968ee8e445299800914b5a46da3a.zip
cpython-3d3bc8121915968ee8e445299800914b5a46da3a.tar.gz
cpython-3d3bc8121915968ee8e445299800914b5a46da3a.tar.bz2
Issue #12678: Fix distutils sdist test on Windows.
Patch by Jeremy Kloth.
-rw-r--r--Lib/distutils/tests/test_sdist.py1
-rw-r--r--Misc/ACKS1
2 files changed, 2 insertions, 0 deletions
diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py
index 440af98..f34f786 100644
--- a/Lib/distutils/tests/test_sdist.py
+++ b/Lib/distutils/tests/test_sdist.py
@@ -365,6 +365,7 @@ class SDistTestCase(PyPIRCCommandTestCase):
def test_manual_manifest(self):
# check that a MANIFEST without a marker is left alone
dist, cmd = self.get_cmd()
+ cmd.formats = ['gztar']
cmd.ensure_finalized()
self.write_file((self.tmp_dir, cmd.manifest), 'README.manual')
self.write_file((self.tmp_dir, 'README.manual'),
diff --git a/Misc/ACKS b/Misc/ACKS
index d345e54..6f7d9d1 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -484,6 +484,7 @@ Reid Kleckner
Bastian Kleineidam
Bob Kline
Matthias Klose
+Jeremy Kloth
Kim Knapp
Lenny Kneler
Pat Knight