summaryrefslogtreecommitdiffstats
path: root/Lib/distutils
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2012-02-26 03:07:37 (GMT)
committerÉric Araujo <merwok@netwok.org>2012-02-26 03:07:37 (GMT)
commit408026c7e8c019cf04372a4267c832241e18c62c (patch)
tree4fcb98a84a03a0234306d716c45af02d9b38788e /Lib/distutils
parentdfac6cc3e9df2a7352aaad3bb36390f850fc8ee6 (diff)
parentf527277b678b263b9d2f5ab52fb804fd1f62cde3 (diff)
downloadcpython-408026c7e8c019cf04372a4267c832241e18c62c.zip
cpython-408026c7e8c019cf04372a4267c832241e18c62c.tar.gz
cpython-408026c7e8c019cf04372a4267c832241e18c62c.tar.bz2
Merge 3.2
Diffstat (limited to 'Lib/distutils')
-rw-r--r--Lib/distutils/tests/test_sdist.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py
index fd71dac..1ba2a1a 100644
--- a/Lib/distutils/tests/test_sdist.py
+++ b/Lib/distutils/tests/test_sdist.py
@@ -6,6 +6,7 @@ import warnings
import zipfile
from os.path import join
from textwrap import dedent
+from test.support import captured_stdout, check_warnings, run_unittest
try:
import zlib
@@ -13,7 +14,6 @@ try:
except ImportError:
ZLIB_SUPPORT = False
-from test.support import captured_stdout, check_warnings, run_unittest
from distutils.command.sdist import sdist, show_formats
from distutils.core import Distribution
@@ -326,6 +326,7 @@ class SDistTestCase(PyPIRCCommandTestCase):
# filling data_files by pointing files in package_data
dist.package_data = {'somecode': ['*.txt']}
self.write_file((self.tmp_dir, 'somecode', 'doc.txt'), '#')
+ cmd.formats = ['gztar']
cmd.ensure_finalized()
cmd.run()