Merged revisions 86236,86240,86332,86340,87271,87273,87447 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
To comply with the 2.x doc style, the methods in trace.rst use brackets around
optional arguments. The rest is a mostly straight merge, modulo support changed
to test_support and use of the old super call style in test_tuple.
........
r86236 | eric.araujo | 2010-11-06 03:44:43 +0100 (sam., 06 nov. 2010) | 2 lines
Make sure each test can be run standalone (./python Lib/distutils/tests/x.py)
........
r86240 | eric.araujo | 2010-11-06 05:11:59 +0100 (sam., 06 nov. 2010) | 2 lines
Prevent ResourceWarnings in test_gettext
........
r86332 | eric.araujo | 2010-11-08 19:15:17 +0100 (lun., 08 nov. 2010) | 4 lines
Add missing NEWS entry for a fix committed by Senthil.
All recent modifications to distutils should now be covered in NEWS.
........
r86340 | eric.araujo | 2010-11-08 22:48:23 +0100 (lun., 08 nov. 2010) | 2 lines
This was actually fixed for the previous alpha.
........
r87271 | eric.araujo | 2010-12-15 20:09:58 +0100 (mer., 15 déc. 2010) | 2 lines
Improve trace documentation (#9264). Patch by Eli Bendersky.
........
r87273 | eric.araujo | 2010-12-15 20:30:15 +0100 (mer., 15 déc. 2010) | 2 lines
Use nested method directives, rewrap long lines, fix whitespace.
........
r87447 | eric.araujo | 2010-12-23 20:13:05 +0100 (jeu., 23 déc. 2010) | 2 lines
Fix typo in superclass method name
........
diff --git a/Lib/distutils/tests/__init__.py b/Lib/distutils/tests/__init__.py
index 7bdb912..697ff84 100644
--- a/Lib/distutils/tests/__init__.py
+++ b/Lib/distutils/tests/__init__.py
@@ -15,9 +15,10 @@
import os
import sys
import unittest
+from test.test_support import run_unittest
-here = os.path.dirname(__file__)
+here = os.path.dirname(__file__) or os.curdir
def test_suite():
@@ -32,4 +33,4 @@
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py
index bab9157..1f7106f 100644
--- a/Lib/distutils/tests/test_archive_util.py
+++ b/Lib/distutils/tests/test_archive_util.py
@@ -12,7 +12,7 @@
ARCHIVE_FORMATS)
from distutils.spawn import find_executable, spawn
from distutils.tests import support
-from test.test_support import check_warnings
+from test.test_support import check_warnings, run_unittest
try:
import grp
@@ -281,4 +281,4 @@
return unittest.makeSuite(ArchiveUtilTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_bdist_msi.py b/Lib/distutils/tests/test_bdist_msi.py
index 7554e9f..1c897ab 100644
--- a/Lib/distutils/tests/test_bdist_msi.py
+++ b/Lib/distutils/tests/test_bdist_msi.py
@@ -11,7 +11,7 @@
support.LoggingSilencer,
unittest.TestCase):
- def test_minial(self):
+ def test_minimal(self):
# minimal test XXX need more tests
from distutils.command.bdist_msi import bdist_msi
pkg_pth, dist = self.create_dist()
diff --git a/Lib/distutils/tests/test_build.py b/Lib/distutils/tests/test_build.py
index 3db5703..eeb8d73 100644
--- a/Lib/distutils/tests/test_build.py
+++ b/Lib/distutils/tests/test_build.py
@@ -2,6 +2,7 @@
import unittest
import os
import sys
+from test.test_support import run_unittest
from distutils.command.build import build
from distutils.tests import support
@@ -51,4 +52,4 @@
return unittest.makeSuite(BuildTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_build_clib.py b/Lib/distutils/tests/test_build_clib.py
index d77912a..4f4e2bc 100644
--- a/Lib/distutils/tests/test_build_clib.py
+++ b/Lib/distutils/tests/test_build_clib.py
@@ -3,6 +3,8 @@
import os
import sys
+from test.test_support import run_unittest
+
from distutils.command.build_clib import build_clib
from distutils.errors import DistutilsSetupError
from distutils.tests import support
@@ -140,4 +142,4 @@
return unittest.makeSuite(BuildCLibTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_build_py.py b/Lib/distutils/tests/test_build_py.py
index 0351739..937fa0c 100644
--- a/Lib/distutils/tests/test_build_py.py
+++ b/Lib/distutils/tests/test_build_py.py
@@ -10,6 +10,7 @@
from distutils.errors import DistutilsFileError
from distutils.tests import support
+from test.test_support import run_unittest
class BuildPyTestCase(support.TempdirManager,
@@ -123,4 +124,4 @@
return unittest.makeSuite(BuildPyTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_build_scripts.py b/Lib/distutils/tests/test_build_scripts.py
index df89cde..4da93cc 100644
--- a/Lib/distutils/tests/test_build_scripts.py
+++ b/Lib/distutils/tests/test_build_scripts.py
@@ -8,6 +8,7 @@
import sysconfig
from distutils.tests import support
+from test.test_support import run_unittest
class BuildScriptsTestCase(support.TempdirManager,
@@ -108,4 +109,4 @@
return unittest.makeSuite(BuildScriptsTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_check.py b/Lib/distutils/tests/test_check.py
index 7c56c04..4ea83dc 100644
--- a/Lib/distutils/tests/test_check.py
+++ b/Lib/distutils/tests/test_check.py
@@ -1,5 +1,6 @@
"""Tests for distutils.command.check."""
import unittest
+from test.test_support import run_unittest
from distutils.command.check import check, HAS_DOCUTILS
from distutils.tests import support
@@ -95,4 +96,4 @@
return unittest.makeSuite(CheckTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_clean.py b/Lib/distutils/tests/test_clean.py
index dbc4ee2..2d1610d 100644
--- a/Lib/distutils/tests/test_clean.py
+++ b/Lib/distutils/tests/test_clean.py
@@ -6,6 +6,7 @@
from distutils.command.clean import clean
from distutils.tests import support
+from test.test_support import run_unittest
class cleanTestCase(support.TempdirManager,
support.LoggingSilencer,
@@ -47,4 +48,4 @@
return unittest.makeSuite(cleanTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_cmd.py b/Lib/distutils/tests/test_cmd.py
index 97cdb8a..e074099 100644
--- a/Lib/distutils/tests/test_cmd.py
+++ b/Lib/distutils/tests/test_cmd.py
@@ -99,7 +99,7 @@
def test_ensure_dirname(self):
cmd = self.cmd
- cmd.option1 = os.path.dirname(__file__)
+ cmd.option1 = os.path.dirname(__file__) or os.curdir
cmd.ensure_dirname('option1')
cmd.option2 = 'xxx'
self.assertRaises(DistutilsOptionError, cmd.ensure_dirname, 'option2')
diff --git a/Lib/distutils/tests/test_config.py b/Lib/distutils/tests/test_config.py
index 8d71234..cfd096e 100644
--- a/Lib/distutils/tests/test_config.py
+++ b/Lib/distutils/tests/test_config.py
@@ -11,6 +11,7 @@
from distutils.log import WARN
from distutils.tests import support
+from test.test_support import run_unittest
PYPIRC = """\
[distutils]
@@ -119,4 +120,4 @@
return unittest.makeSuite(PyPIRCCommandTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_config_cmd.py b/Lib/distutils/tests/test_config_cmd.py
index fcb798e..a36a1d5 100644
--- a/Lib/distutils/tests/test_config_cmd.py
+++ b/Lib/distutils/tests/test_config_cmd.py
@@ -2,6 +2,7 @@
import unittest
import os
import sys
+from test.test_support import run_unittest
from distutils.command.config import dump_file, config
from distutils.tests import support
@@ -86,4 +87,4 @@
return unittest.makeSuite(ConfigTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_core.py b/Lib/distutils/tests/test_core.py
index 74d1f3b..0d979bc 100644
--- a/Lib/distutils/tests/test_core.py
+++ b/Lib/distutils/tests/test_core.py
@@ -6,7 +6,7 @@
import shutil
import sys
import test.test_support
-from test.test_support import captured_stdout
+from test.test_support import captured_stdout, run_unittest
import unittest
from distutils.tests import support
@@ -105,4 +105,4 @@
return unittest.makeSuite(CoreTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_dep_util.py b/Lib/distutils/tests/test_dep_util.py
index 3550819..7510434 100644
--- a/Lib/distutils/tests/test_dep_util.py
+++ b/Lib/distutils/tests/test_dep_util.py
@@ -6,6 +6,7 @@
from distutils.dep_util import newer, newer_pairwise, newer_group
from distutils.errors import DistutilsFileError
from distutils.tests import support
+from test.test_support import run_unittest
class DepUtilTestCase(support.TempdirManager, unittest.TestCase):
@@ -77,4 +78,4 @@
return unittest.makeSuite(DepUtilTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_dir_util.py b/Lib/distutils/tests/test_dir_util.py
index 84a0ec6..693f77c 100644
--- a/Lib/distutils/tests/test_dir_util.py
+++ b/Lib/distutils/tests/test_dir_util.py
@@ -10,6 +10,7 @@
from distutils import log
from distutils.tests import support
+from test.test_support import run_unittest
class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
@@ -112,4 +113,4 @@
return unittest.makeSuite(DirUtilTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_dist.py b/Lib/distutils/tests/test_dist.py
index 8ab7e9f..ba60638 100644
--- a/Lib/distutils/tests/test_dist.py
+++ b/Lib/distutils/tests/test_dist.py
@@ -11,7 +11,7 @@
from distutils.dist import Distribution, fix_help_options, DistributionMetadata
from distutils.cmd import Command
import distutils.dist
-from test.test_support import TESTFN, captured_stdout
+from test.test_support import TESTFN, captured_stdout, run_unittest
from distutils.tests import support
class test_dist(Command):
@@ -433,4 +433,4 @@
return suite
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_file_util.py b/Lib/distutils/tests/test_file_util.py
index dbc6283..7dbcf52 100644
--- a/Lib/distutils/tests/test_file_util.py
+++ b/Lib/distutils/tests/test_file_util.py
@@ -6,6 +6,7 @@
from distutils.file_util import move_file, write_file, copy_file
from distutils import log
from distutils.tests import support
+from test.test_support import run_unittest
class FileUtilTestCase(support.TempdirManager, unittest.TestCase):
@@ -77,4 +78,4 @@
return unittest.makeSuite(FileUtilTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_filelist.py b/Lib/distutils/tests/test_filelist.py
index 32c56c7..be11ea5d 100644
--- a/Lib/distutils/tests/test_filelist.py
+++ b/Lib/distutils/tests/test_filelist.py
@@ -1,7 +1,7 @@
"""Tests for distutils.filelist."""
from os.path import join
import unittest
-from test.test_support import captured_stdout
+from test.test_support import captured_stdout, run_unittest
from distutils.filelist import glob_to_re, FileList
from distutils import debug
@@ -82,4 +82,4 @@
return unittest.makeSuite(FileListTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py
index c834b91..4f976f3 100644
--- a/Lib/distutils/tests/test_install.py
+++ b/Lib/distutils/tests/test_install.py
@@ -3,6 +3,8 @@
import os
import unittest
+from test.test_support import run_unittest
+
from distutils.command.install import install
from distutils.core import Distribution
@@ -52,4 +54,4 @@
return unittest.makeSuite(InstallTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_install_data.py b/Lib/distutils/tests/test_install_data.py
index 86db4a1..4775694 100644
--- a/Lib/distutils/tests/test_install_data.py
+++ b/Lib/distutils/tests/test_install_data.py
@@ -6,6 +6,7 @@
from distutils.command.install_data import install_data
from distutils.tests import support
+from test.test_support import run_unittest
class InstallDataTestCase(support.TempdirManager,
support.LoggingSilencer,
@@ -73,4 +74,4 @@
return unittest.makeSuite(InstallDataTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_install_headers.py b/Lib/distutils/tests/test_install_headers.py
index aa8a4e6..b37224b 100644
--- a/Lib/distutils/tests/test_install_headers.py
+++ b/Lib/distutils/tests/test_install_headers.py
@@ -6,6 +6,7 @@
from distutils.command.install_headers import install_headers
from distutils.tests import support
+from test.test_support import run_unittest
class InstallHeadersTestCase(support.TempdirManager,
support.LoggingSilencer,
@@ -37,4 +38,4 @@
return unittest.makeSuite(InstallHeadersTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_install_lib.py b/Lib/distutils/tests/test_install_lib.py
index 754ea63..4d86308 100644
--- a/Lib/distutils/tests/test_install_lib.py
+++ b/Lib/distutils/tests/test_install_lib.py
@@ -7,6 +7,7 @@
from distutils.extension import Extension
from distutils.tests import support
from distutils.errors import DistutilsOptionError
+from test.test_support import run_unittest
class InstallLibTestCase(support.TempdirManager,
support.LoggingSilencer,
@@ -103,4 +104,4 @@
return unittest.makeSuite(InstallLibTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_install_scripts.py b/Lib/distutils/tests/test_install_scripts.py
index 08360d2..4608545 100644
--- a/Lib/distutils/tests/test_install_scripts.py
+++ b/Lib/distutils/tests/test_install_scripts.py
@@ -7,6 +7,7 @@
from distutils.core import Distribution
from distutils.tests import support
+from test.test_support import run_unittest
class InstallScriptsTestCase(support.TempdirManager,
@@ -78,4 +79,4 @@
return unittest.makeSuite(InstallScriptsTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_msvc9compiler.py b/Lib/distutils/tests/test_msvc9compiler.py
index b8e2209..e155dbf 100644
--- a/Lib/distutils/tests/test_msvc9compiler.py
+++ b/Lib/distutils/tests/test_msvc9compiler.py
@@ -5,6 +5,7 @@
from distutils.errors import DistutilsPlatformError
from distutils.tests import support
+from test.test_support import run_unittest
_MANIFEST = """\
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -137,4 +138,4 @@
return unittest.makeSuite(msvc9compilerTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_register.py b/Lib/distutils/tests/test_register.py
index 915427b..dd60f8c 100644
--- a/Lib/distutils/tests/test_register.py
+++ b/Lib/distutils/tests/test_register.py
@@ -7,7 +7,7 @@
import urllib2
import warnings
-from test.test_support import check_warnings
+from test.test_support import check_warnings, run_unittest
from distutils.command import register as register_module
from distutils.command.register import register
@@ -258,4 +258,4 @@
return unittest.makeSuite(RegisterTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py
index b9d86bb..ab8c3d9 100644
--- a/Lib/distutils/tests/test_sdist.py
+++ b/Lib/distutils/tests/test_sdist.py
@@ -24,11 +24,9 @@
import tempfile
import warnings
-from test.test_support import check_warnings
-from test.test_support import captured_stdout
+from test.test_support import captured_stdout, check_warnings, run_unittest
-from distutils.command.sdist import sdist
-from distutils.command.sdist import show_formats
+from distutils.command.sdist import sdist, show_formats
from distutils.core import Distribution
from distutils.tests.test_config import PyPIRCCommandTestCase
from distutils.errors import DistutilsExecError, DistutilsOptionError
@@ -426,4 +424,4 @@
return unittest.makeSuite(SDistTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_spawn.py b/Lib/distutils/tests/test_spawn.py
index 6caf039..defa54d 100644
--- a/Lib/distutils/tests/test_spawn.py
+++ b/Lib/distutils/tests/test_spawn.py
@@ -2,7 +2,7 @@
import unittest
import os
import time
-from test.test_support import captured_stdout
+from test.test_support import captured_stdout, run_unittest
from distutils.spawn import _nt_quote_args
from distutils.spawn import spawn, find_executable
@@ -57,4 +57,4 @@
return unittest.makeSuite(SpawnTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_text_file.py b/Lib/distutils/tests/test_text_file.py
index f1e32b6..ce19cd4 100644
--- a/Lib/distutils/tests/test_text_file.py
+++ b/Lib/distutils/tests/test_text_file.py
@@ -3,6 +3,7 @@
import unittest
from distutils.text_file import TextFile
from distutils.tests import support
+from test.test_support import run_unittest
TEST_DATA = """# test file
@@ -103,4 +104,4 @@
return unittest.makeSuite(TextFileTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_unixccompiler.py b/Lib/distutils/tests/test_unixccompiler.py
index 3f233e2..40c908a 100644
--- a/Lib/distutils/tests/test_unixccompiler.py
+++ b/Lib/distutils/tests/test_unixccompiler.py
@@ -1,6 +1,7 @@
"""Tests for distutils.unixccompiler."""
import sys
import unittest
+from test.test_support import run_unittest
from distutils import sysconfig
from distutils.unixccompiler import UnixCCompiler
@@ -126,4 +127,4 @@
return unittest.makeSuite(UnixCCompilerTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_upload.py b/Lib/distutils/tests/test_upload.py
index f45ee41..9911199 100644
--- a/Lib/distutils/tests/test_upload.py
+++ b/Lib/distutils/tests/test_upload.py
@@ -1,14 +1,13 @@
-"""Tests for distutils.command.upload."""
# -*- encoding: utf8 -*-
-import sys
+"""Tests for distutils.command.upload."""
import os
import unittest
+from test.test_support import run_unittest
from distutils.command import upload as upload_mod
from distutils.command.upload import upload
from distutils.core import Distribution
-from distutils.tests import support
from distutils.tests.test_config import PYPIRC, PyPIRCCommandTestCase
PYPIRC_LONG_PASSWORD = """\
@@ -129,4 +128,4 @@
return unittest.makeSuite(uploadTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_util.py b/Lib/distutils/tests/test_util.py
index 981ad00..67cd4cc 100644
--- a/Lib/distutils/tests/test_util.py
+++ b/Lib/distutils/tests/test_util.py
@@ -1,6 +1,7 @@
"""Tests for distutils.util."""
import sys
import unittest
+from test.test_support import run_unittest
from distutils.errors import DistutilsPlatformError, DistutilsByteCompileError
from distutils.util import byte_compile
@@ -21,4 +22,4 @@
return unittest.makeSuite(UtilTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_version.py b/Lib/distutils/tests/test_version.py
index 1d9fbc7..2189956 100644
--- a/Lib/distutils/tests/test_version.py
+++ b/Lib/distutils/tests/test_version.py
@@ -2,6 +2,7 @@
import unittest
from distutils.version import LooseVersion
from distutils.version import StrictVersion
+from test.test_support import run_unittest
class VersionTestCase(unittest.TestCase):
@@ -67,4 +68,4 @@
return unittest.makeSuite(VersionTestCase)
if __name__ == "__main__":
- unittest.main(defaultTest="test_suite")
+ run_unittest(test_suite())
diff --git a/Lib/distutils/tests/test_versionpredicate.py b/Lib/distutils/tests/test_versionpredicate.py
index 8a60dbe..1d6c8d5 100644
--- a/Lib/distutils/tests/test_versionpredicate.py
+++ b/Lib/distutils/tests/test_versionpredicate.py
@@ -4,6 +4,10 @@
import distutils.versionpredicate
import doctest
+from test.test_support import run_unittest
def test_suite():
return doctest.DocTestSuite(distutils.versionpredicate)
+
+if __name__ == '__main__':
+ run_unittest(test_suite())
diff --git a/Lib/test/test_gettext.py b/Lib/test/test_gettext.py
index 65b395b..f036954 100644
--- a/Lib/test/test_gettext.py
+++ b/Lib/test/test_gettext.py
@@ -64,15 +64,13 @@
def setUp(self):
if not os.path.isdir(LOCALEDIR):
os.makedirs(LOCALEDIR)
- fp = open(MOFILE, 'wb')
- fp.write(base64.decodestring(GNU_MO_DATA))
- fp.close()
- fp = open(UMOFILE, 'wb')
- fp.write(base64.decodestring(UMO_DATA))
- fp.close()
- fp = open(MMOFILE, 'wb')
- fp.write(base64.decodestring(MMO_DATA))
- fp.close()
+ with open(MOFILE, 'wb') as fp:
+ fp.write(base64.decodestring(GNU_MO_DATA))
+ with open(UMOFILE, 'wb') as fp:
+ fp.write(base64.decodestring(UMO_DATA))
+ with open(MMOFILE, 'wb') as fp:
+ fp.write(base64.decodestring(MMO_DATA))
+
self.env = test_support.EnvironmentVarGuard()
self.env['LANGUAGE'] = 'xx'
gettext._translations.clear()
@@ -135,9 +133,8 @@
def test_the_alternative_interface(self):
eq = self.assertEqual
# test the alternative interface
- fp = open(self.mofile, 'rb')
- t = gettext.GNUTranslations(fp)
- fp.close()
+ with open(self.mofile, 'rb') as fp:
+ t = gettext.GNUTranslations(fp)
# Install the translation object
t.install()
eq(_('nudge nudge'), 'wink wink')
@@ -227,9 +224,8 @@
def test_plural_forms2(self):
eq = self.assertEqual
- fp = open(self.mofile, 'rb')
- t = gettext.GNUTranslations(fp)
- fp.close()
+ with open(self.mofile, 'rb') as fp:
+ t = gettext.GNUTranslations(fp)
x = t.ngettext('There is %s file', 'There are %s files', 1)
eq(x, 'Hay %s fichero')
x = t.ngettext('There is %s file', 'There are %s files', 2)
@@ -299,11 +295,8 @@
class UnicodeTranslationsTest(GettextBaseTest):
def setUp(self):
GettextBaseTest.setUp(self)
- fp = open(UMOFILE, 'rb')
- try:
+ with open(UMOFILE, 'rb') as fp:
self.t = gettext.GNUTranslations(fp)
- finally:
- fp.close()
self._ = self.t.ugettext
def test_unicode_msgid(self):
@@ -319,15 +312,12 @@
class WeirdMetadataTest(GettextBaseTest):
def setUp(self):
GettextBaseTest.setUp(self)
- fp = open(MMOFILE, 'rb')
- try:
+ with open(MMOFILE, 'rb') as fp:
try:
self.t = gettext.GNUTranslations(fp)
except:
self.tearDown()
raise
- finally:
- fp.close()
def test_weird_metadata(self):
info = self.t.info()
diff --git a/Lib/test/test_tuple.py b/Lib/test/test_tuple.py
index 4d2137f..0c308f0 100644
--- a/Lib/test/test_tuple.py
+++ b/Lib/test/test_tuple.py
@@ -6,7 +6,7 @@
type2test = tuple
def test_constructors(self):
- super(TupleTest, self).test_len()
+ super(TupleTest, self).test_constructors()
# calling built-in types without argument must return empty
self.assertEqual(tuple(), ())
t0_3 = (0, 1, 2, 3)