Sun Mar 14 11:23:40 CET 2010

Author: georg.brandl
Date: Sun Mar 14 11:23:39 2010
New Revision: 78955
Log:
Merged revisions 78018,78035-78040,78042-78043,78046,78048-78052,78054,78059,78075-78080 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r78018 | georg.brandl | 2010年02月06日 11:08:21 +0100 (Sa, 06 Feb 2010) | 1 line
 
 #7864: make deprecation notices a bit clearer.
........
 r78035 | georg.brandl | 2010年02月06日 23:44:17 +0100 (Sa, 06 Feb 2010) | 1 line
 
 Fix duplicate import.
........
 r78036 | georg.brandl | 2010年02月06日 23:49:47 +0100 (Sa, 06 Feb 2010) | 1 line
 
 Remove unused import.
........
 r78037 | georg.brandl | 2010年02月06日 23:59:15 +0100 (Sa, 06 Feb 2010) | 1 line
 
 No need to assign the results of expressions used only for side effects.
........
 r78038 | georg.brandl | 2010年02月07日 00:02:29 +0100 (So, 07 Feb 2010) | 1 line
 
 Add a missing import.
........
 r78039 | georg.brandl | 2010年02月07日 00:06:24 +0100 (So, 07 Feb 2010) | 1 line
 
 Add missing imports.
........
 r78040 | georg.brandl | 2010年02月07日 00:08:00 +0100 (So, 07 Feb 2010) | 1 line
 
 Fix a few UnboundLocalErrors in test_long.
........
 r78042 | georg.brandl | 2010年02月07日 00:12:12 +0100 (So, 07 Feb 2010) | 1 line
 
 Add missing import.
........
 r78043 | georg.brandl | 2010年02月07日 00:12:19 +0100 (So, 07 Feb 2010) | 1 line
 
 Remove duplicate test method.
........
 r78046 | georg.brandl | 2010年02月07日 00:18:00 +0100 (So, 07 Feb 2010) | 1 line
 
 Fix various missing import/unbound name errors.
........
 r78048 | georg.brandl | 2010年02月07日 00:23:45 +0100 (So, 07 Feb 2010) | 1 line
 
 We heard you like test failures so we put unbound locals in your test so that you can fail while you fail.
........
 r78049 | georg.brandl | 2010年02月07日 00:33:33 +0100 (So, 07 Feb 2010) | 1 line
 
 Fix import/access for some identifiers. _TestSharedCTypes does not seem to be executed?
........
 r78050 | georg.brandl | 2010年02月07日 00:34:10 +0100 (So, 07 Feb 2010) | 1 line
 
 Fix more unbound locals in code paths that do not seem to be used.
........
 r78051 | georg.brandl | 2010年02月07日 00:53:52 +0100 (So, 07 Feb 2010) | 1 line
 
 Add missing import when running these tests standalone.
........
 r78052 | georg.brandl | 2010年02月07日 00:54:04 +0100 (So, 07 Feb 2010) | 1 line
 
 Add missing import when running these tests standalone.
........
 r78054 | georg.brandl | 2010年02月07日 00:58:25 +0100 (So, 07 Feb 2010) | 1 line
 
 Add missing import.
........
 r78059 | georg.brandl | 2010年02月07日 12:34:15 +0100 (So, 07 Feb 2010) | 1 line
 
 Use "regexp" consistently.
........
 r78075 | georg.brandl | 2010年02月07日 13:16:12 +0100 (So, 07 Feb 2010) | 1 line
 
 Fix another duplicated test method.
........
 r78076 | georg.brandl | 2010年02月07日 13:19:43 +0100 (So, 07 Feb 2010) | 1 line
 
 Fix wrong usage of "except X, Y:".
........
 r78077 | georg.brandl | 2010年02月07日 13:25:50 +0100 (So, 07 Feb 2010) | 1 line
 
 Fix two redefined test methods.
........
 r78078 | georg.brandl | 2010年02月07日 13:27:06 +0100 (So, 07 Feb 2010) | 1 line
 
 Fix a redefined test method.
........
 r78079 | georg.brandl | 2010年02月07日 13:34:26 +0100 (So, 07 Feb 2010) | 1 line
 
 Add a minimal test for fnmatchcase().
........
 r78080 | georg.brandl | 2010年02月07日 13:55:12 +0100 (So, 07 Feb 2010) | 1 line
 
 Remove duplicate test method.
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Doc/library/unittest.rst
 python/branches/py3k/Lib/distutils/tests/test_bdist.py
 python/branches/py3k/Lib/distutils/tests/test_bdist_dumb.py
 python/branches/py3k/Lib/distutils/tests/test_bdist_msi.py
 python/branches/py3k/Lib/distutils/tests/test_bdist_rpm.py
 python/branches/py3k/Lib/distutils/tests/test_bdist_wininst.py
 python/branches/py3k/Lib/distutils/tests/test_cmd.py
 python/branches/py3k/Lib/distutils/tests/test_cygwinccompiler.py
 python/branches/py3k/Lib/distutils/tests/test_emxccompiler.py
 python/branches/py3k/Lib/distutils/tests/test_sysconfig.py
 python/branches/py3k/Lib/email/test/test_email_torture.py
 python/branches/py3k/Lib/genericpath.py
 python/branches/py3k/Lib/mimetypes.py
 python/branches/py3k/Lib/posixpath.py
 python/branches/py3k/Lib/subprocess.py
 python/branches/py3k/Lib/test/test_csv.py
 python/branches/py3k/Lib/test/test_docxmlrpc.py
 python/branches/py3k/Lib/test/test_fnmatch.py
 python/branches/py3k/Lib/test/test_functools.py
 python/branches/py3k/Lib/test/test_long.py
 python/branches/py3k/Lib/test/test_minidom.py
 python/branches/py3k/Lib/test/test_multiprocessing.py
 python/branches/py3k/Lib/test/test_optparse.py
 python/branches/py3k/Lib/test/test_pep292.py
 python/branches/py3k/Lib/test/test_platform.py
 python/branches/py3k/Lib/test/test_posixpath.py
 python/branches/py3k/Lib/test/test_richcmp.py
 python/branches/py3k/Lib/test/test_ssl.py
 python/branches/py3k/Lib/test/test_sysconfig.py
 python/branches/py3k/Lib/test/test_tempfile.py
 python/branches/py3k/Lib/test/test_threaded_import.py
 python/branches/py3k/Lib/test/test_zipimport.py
 python/branches/py3k/Lib/unittest/case.py
Modified: python/branches/py3k/Doc/library/unittest.rst
==============================================================================

--- python/branches/py3k/Doc/library/unittest.rst	(original)
+++ python/branches/py3k/Doc/library/unittest.rst	Sun Mar 14 11:23:39 2010
@@ -676,7 +676,7 @@
 will be *msg* if given, otherwise it will be :const:`None`.
 
 .. deprecated:: 3.1
- :meth:`failUnless`.
+ :meth:`failUnless`; use one of the ``assert`` variants.
 :meth:`assert_`; use :meth:`assertTrue`.
 
 
@@ -704,7 +704,7 @@
 function for comparing strings.
 
 .. deprecated:: 3.1
- :meth:`failUnlessEqual`.
+ :meth:`failUnlessEqual`; use :meth:`assertEqual`.
 
 
 .. method:: assertNotEqual(first, second, msg=None)
@@ -718,7 +718,7 @@
 *first* and *second*.
 
 .. deprecated:: 3.1
- :meth:`failIfEqual`.
+ :meth:`failIfEqual`; use :meth:`assertNotEqual`.
 
 
 .. method:: assertAlmostEqual(first, second, *, places=7, msg=None)
@@ -737,7 +737,7 @@
 Objects that compare equal are automatically almost equal.
 
 .. deprecated:: 3.1
- :meth:`failUnlessAlmostEqual`.
+ :meth:`failUnlessAlmostEqual`; use :meth:`assertAlmostEqual`.
 
 
 .. method:: assertNotAlmostEqual(first, second, *, places=7, msg=None)
@@ -756,7 +756,7 @@
 Objects that compare equal automatically fail.
 
 .. deprecated:: 3.1
- :meth:`failIfAlmostEqual`.
+ :meth:`failIfAlmostEqual`; use :meth:`assertNotAlmostEqual`.
 
 
 .. method:: assertGreater(first, second, msg=None)
@@ -923,7 +923,7 @@
 Added the :attr:`exception` attribute.
 
 .. deprecated:: 3.1
- :meth:`failUnlessRaises`.
+ :meth:`failUnlessRaises`; use :meth:`assertRaises`.
 
 
 .. method:: assertRaisesRegexp(exception, regexp[, callable, ...])
@@ -1000,7 +1000,7 @@
 for the error message.
 
 .. deprecated:: 3.1
- :meth:`failIf`.
+ :meth:`failIf`; use :meth:`assertFalse`.
 
 
 .. method:: fail(msg=None)
Modified: python/branches/py3k/Lib/distutils/tests/test_bdist.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_bdist.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_bdist.py	Sun Mar 14 11:23:39 2010
@@ -5,6 +5,8 @@
 import tempfile
 import shutil
 
+from test.support import run_unittest
+
 from distutils.core import Distribution
 from distutils.command.bdist import bdist
 from distutils.tests import support
@@ -40,4 +42,4 @@
 return unittest.makeSuite(BuildTestCase)
 
 if __name__ == '__main__':
- test_support.run_unittest(test_suite())
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_bdist_dumb.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_bdist_dumb.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_bdist_dumb.py	Sun Mar 14 11:23:39 2010
@@ -11,6 +11,8 @@
 except ImportError:
 zlib = None
 
+from test.support import run_unittest
+
 from distutils.core import Distribution
 from distutils.command.bdist_dumb import bdist_dumb
 from distutils.tests import support
@@ -100,4 +102,4 @@
 return unittest.makeSuite(BuildDumbTestCase)
 
 if __name__ == '__main__':
- test_support.run_unittest(test_suite())
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_bdist_msi.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_bdist_msi.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_bdist_msi.py	Sun Mar 14 11:23:39 2010
@@ -2,6 +2,8 @@
 import unittest
 import sys
 
+from test.support import run_unittest
+
 from distutils.tests import support
 
 @unittest.skipUnless(sys.platform=="win32", "These tests are only for win32")
@@ -20,4 +22,4 @@
 return unittest.makeSuite(BDistMSITestCase)
 
 if __name__ == '__main__':
- test_support.run_unittest(test_suite())
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_bdist_rpm.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_bdist_rpm.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_bdist_rpm.py	Sun Mar 14 11:23:39 2010
@@ -6,6 +6,8 @@
 import tempfile
 import shutil
 
+from test.support import run_unittest
+
 from distutils.core import Distribution
 from distutils.command.bdist_rpm import bdist_rpm
 from distutils.tests import support
@@ -122,4 +124,4 @@
 return unittest.makeSuite(BuildRpmTestCase)
 
 if __name__ == '__main__':
- test_support.run_unittest(test_suite())
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_bdist_wininst.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_bdist_wininst.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_bdist_wininst.py	Sun Mar 14 11:23:39 2010
@@ -1,6 +1,8 @@
 """Tests for distutils.command.bdist_wininst."""
 import unittest
 
+from test.support import run_unittest
+
 from distutils.command.bdist_wininst import bdist_wininst
 from distutils.tests import support
 
@@ -27,4 +29,4 @@
 return unittest.makeSuite(BuildWinInstTestCase)
 
 if __name__ == '__main__':
- test_support.run_unittest(test_suite())
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_cmd.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_cmd.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_cmd.py	Sun Mar 14 11:23:39 2010
@@ -1,7 +1,7 @@
 """Tests for distutils.cmd."""
 import unittest
 import os
-from test.support import captured_stdout
+from test.support import captured_stdout, run_unittest
 
 from distutils.cmd import Command
 from distutils.dist import Distribution
@@ -124,4 +124,4 @@
 return unittest.makeSuite(CommandTestCase)
 
 if __name__ == '__main__':
- test_support.run_unittest(test_suite())
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_cygwinccompiler.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_cygwinccompiler.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_cygwinccompiler.py	Sun Mar 14 11:23:39 2010
@@ -6,7 +6,7 @@
 import warnings
 import sysconfig
 
-from test.support import check_warnings
+from test.support import check_warnings, run_unittest
 from test.support import captured_stdout
 
 from distutils import cygwinccompiler
@@ -109,4 +109,4 @@
 return unittest.makeSuite(CygwinCCompilerTestCase)
 
 if __name__ == '__main__':
- test_support.run_unittest(test_suite())
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_emxccompiler.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_emxccompiler.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_emxccompiler.py	Sun Mar 14 11:23:39 2010
@@ -4,7 +4,7 @@
 import os
 import warnings
 
-from test.support import check_warnings
+from test.support import check_warnings, run_unittest
 from test.support import captured_stdout
 
 from distutils.emxccompiler import get_versions
@@ -30,4 +30,4 @@
 return unittest.makeSuite(EmxCCompilerTestCase)
 
 if __name__ == '__main__':
- test_support.run_unittest(test_suite())
+ run_unittest(test_suite())
Modified: python/branches/py3k/Lib/distutils/tests/test_sysconfig.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_sysconfig.py	(original)
+++ python/branches/py3k/Lib/distutils/tests/test_sysconfig.py	Sun Mar 14 11:23:39 2010
@@ -2,6 +2,7 @@
 import os
 import test
 import unittest
+import shutil
 
 from distutils import sysconfig
 from distutils.tests import support
Modified: python/branches/py3k/Lib/email/test/test_email_torture.py
==============================================================================
--- python/branches/py3k/Lib/email/test/test_email_torture.py	(original)
+++ python/branches/py3k/Lib/email/test/test_email_torture.py	Sun Mar 14 11:23:39 2010
@@ -13,7 +13,7 @@
 from types import ListType
 
 from email.test.test_email import TestEmailBase
-from test.support import TestSkipped
+from test.support import TestSkipped, run_unittest
 
 import email
 from email import __file__ as testfile
@@ -128,7 +128,7 @@
 
 def test_main():
 for testclass in _testclasses():
- support.run_unittest(testclass)
+ run_unittest(testclass)
 
 
 
Modified: python/branches/py3k/Lib/genericpath.py
==============================================================================
--- python/branches/py3k/Lib/genericpath.py	(original)
+++ python/branches/py3k/Lib/genericpath.py	Sun Mar 14 11:23:39 2010
@@ -15,7 +15,7 @@
 def exists(path):
 """Test whether a path exists. Returns False for broken symbolic links"""
 try:
- st = os.stat(path)
+ os.stat(path)
 except os.error:
 return False
 return True
Modified: python/branches/py3k/Lib/mimetypes.py
==============================================================================
--- python/branches/py3k/Lib/mimetypes.py	(original)
+++ python/branches/py3k/Lib/mimetypes.py	Sun Mar 14 11:23:39 2010
@@ -538,7 +538,6 @@
 
 
 if __name__ == '__main__':
- import sys
 import getopt
 
 USAGE = """\
Modified: python/branches/py3k/Lib/posixpath.py
==============================================================================
--- python/branches/py3k/Lib/posixpath.py	(original)
+++ python/branches/py3k/Lib/posixpath.py	Sun Mar 14 11:23:39 2010
@@ -158,7 +158,7 @@
 def lexists(path):
 """Test whether a path exists. Returns True for broken symbolic links"""
 try:
- st = os.lstat(path)
+ os.lstat(path)
 except os.error:
 return False
 return True
Modified: python/branches/py3k/Lib/subprocess.py
==============================================================================
--- python/branches/py3k/Lib/subprocess.py	(original)
+++ python/branches/py3k/Lib/subprocess.py	Sun Mar 14 11:23:39 2010
@@ -930,7 +930,7 @@
 """Wait for child process to terminate. Returns returncode
 attribute."""
 if self.returncode is None:
- obj = WaitForSingleObject(self._handle, INFINITE)
+ WaitForSingleObject(self._handle, INFINITE)
 self.returncode = GetExitCodeProcess(self._handle)
 return self.returncode
 
Modified: python/branches/py3k/Lib/test/test_csv.py
==============================================================================
--- python/branches/py3k/Lib/test/test_csv.py	(original)
+++ python/branches/py3k/Lib/test/test_csv.py	Sun Mar 14 11:23:39 2010
@@ -488,10 +488,10 @@
 def test_null(self):
 self.writerAssertEqual([], '')
 
- def test_single(self):
+ def test_single_writer(self):
 self.writerAssertEqual([['abc']], 'abc\r\n')
 
- def test_simple(self):
+ def test_simple_writer(self):
 self.writerAssertEqual([[1, 2, 'abc', 3, 4]], '1,2,abc,3,4\r\n')
 
 def test_quotes(self):
Modified: python/branches/py3k/Lib/test/test_docxmlrpc.py
==============================================================================
--- python/branches/py3k/Lib/test/test_docxmlrpc.py	(original)
+++ python/branches/py3k/Lib/test/test_docxmlrpc.py	Sun Mar 14 11:23:39 2010
@@ -4,6 +4,7 @@
 from test import support
 import threading
 import time
+import socket
 import unittest
 
 PORT = None
Modified: python/branches/py3k/Lib/test/test_fnmatch.py
==============================================================================
--- python/branches/py3k/Lib/test/test_fnmatch.py	(original)
+++ python/branches/py3k/Lib/test/test_fnmatch.py	Sun Mar 14 11:23:39 2010
@@ -50,6 +50,11 @@
 self.assertRaises(TypeError, fnmatchcase, 'test', b'*')
 self.assertRaises(TypeError, fnmatchcase, b'test', '*')
 
+ def test_fnmatchcase(self):
+ check = self.check_match
+ check('AbC', 'abc', 0)
+ check('abc', 'AbC', 0)
+
 def test_bytes(self):
 self.check_match(b'test', b'te*')
 self.check_match(b'test\xff', b'te*\xff')
Modified: python/branches/py3k/Lib/test/test_functools.py
==============================================================================
--- python/branches/py3k/Lib/test/test_functools.py	(original)
+++ python/branches/py3k/Lib/test/test_functools.py	Sun Mar 14 11:23:39 2010
@@ -45,9 +45,17 @@
 # attributes should not be writable
 if not isinstance(self.thetype, type):
 return
- self.assertRaises(TypeError, setattr, p, 'func', map)
- self.assertRaises(TypeError, setattr, p, 'args', (1, 2))
- self.assertRaises(TypeError, setattr, p, 'keywords', dict(a=1, b=2))
+ self.assertRaises(AttributeError, setattr, p, 'func', map)
+ self.assertRaises(AttributeError, setattr, p, 'args', (1, 2))
+ self.assertRaises(AttributeError, setattr, p, 'keywords', dict(a=1, b=2))
+
+ p = self.thetype(hex)
+ try:
+ del p.__dict__
+ except TypeError:
+ pass
+ else:
+ self.fail('partial object allowed __dict__ to be deleted')
 
 def test_argument_checking(self):
 self.assertRaises(TypeError, self.thetype) # need at least a func arg
@@ -123,15 +131,6 @@
 self.assertRaises(ZeroDivisionError, self.thetype(f), 1, 0)
 self.assertRaises(ZeroDivisionError, self.thetype(f, y=0), 1)
 
- def test_attributes(self):
- p = self.thetype(hex)
- try:
- del p.__dict__
- except TypeError:
- pass
- else:
- self.fail('partial object allowed __dict__ to be deleted')
-
 def test_weakref(self):
 f = self.thetype(int, base=16)
 p = proxy(f)
Modified: python/branches/py3k/Lib/test/test_long.py
==============================================================================
--- python/branches/py3k/Lib/test/test_long.py	(original)
+++ python/branches/py3k/Lib/test/test_long.py	Sun Mar 14 11:23:39 2010
@@ -502,7 +502,7 @@
 self.d = d
 assert float(n) / float(d) == value
 else:
- raise TypeError("can't deal with %r" % val)
+ raise TypeError("can't deal with %r" % value)
 
 def _cmp__(self, other):
 if not isinstance(other, Rat):
Modified: python/branches/py3k/Lib/test/test_minidom.py
==============================================================================
--- python/branches/py3k/Lib/test/test_minidom.py	(original)
+++ python/branches/py3k/Lib/test/test_minidom.py	Sun Mar 14 11:23:39 2010
@@ -1449,12 +1449,13 @@
 self.confirm(len(n1.entities) == len(n2.entities)
 and len(n1.notations) == len(n2.notations))
 for i in range(len(n1.notations)):
+ # XXX this loop body doesn't seem to be executed?
 no1 = n1.notations.item(i)
 no2 = n1.notations.item(i)
 self.confirm(no1.name == no2.name
 and no1.publicId == no2.publicId
 and no1.systemId == no2.systemId)
- statck.append((no1, no2))
+ stack.append((no1, no2))
 for i in range(len(n1.entities)):
 e1 = n1.entities.item(i)
 e2 = n2.entities.item(i)
Modified: python/branches/py3k/Lib/test/test_multiprocessing.py
==============================================================================
--- python/branches/py3k/Lib/test/test_multiprocessing.py	(original)
+++ python/branches/py3k/Lib/test/test_multiprocessing.py	Sun Mar 14 11:23:39 2010
@@ -1600,10 +1600,10 @@
 return
 
 x = Value('i', 7, lock=lock)
- y = Value(ctypes.c_double, 1.0/3.0, lock=lock)
+ y = Value(c_double, 1.0/3.0, lock=lock)
 foo = Value(_Foo, 3, 2, lock=lock)
- arr = Array('d', list(range(10)), lock=lock)
- string = Array('c', 20, lock=lock)
+ arr = self.Array('d', list(range(10)), lock=lock)
+ string = self.Array('c', 20, lock=lock)
 string.value = 'hello'
 
 p = self.Process(target=self._double, args=(x, y, foo, arr, string))
Modified: python/branches/py3k/Lib/test/test_optparse.py
==============================================================================
--- python/branches/py3k/Lib/test/test_optparse.py	(original)
+++ python/branches/py3k/Lib/test/test_optparse.py	Sun Mar 14 11:23:39 2010
@@ -441,7 +441,7 @@
 return int(value)
 else:
 return int(value[:-1]) * _time_units[value[-1]]
- except ValueError as IndexError:
+ except (ValueError, IndexError):
 raise OptionValueError(
 'option %s: invalid duration: %r' % (opt, value))
 
Modified: python/branches/py3k/Lib/test/test_pep292.py
==============================================================================
--- python/branches/py3k/Lib/test/test_pep292.py	(original)
+++ python/branches/py3k/Lib/test/test_pep292.py	Sun Mar 14 11:23:39 2010
@@ -86,13 +86,6 @@
 s = Template('$who likes 100ドル')
 raises(ValueError, s.substitute, dict(who='tim'))
 
- def test_delimiter_override(self):
- class PieDelims(Template):
- delimiter = '@'
- s = PieDelims('@who likes to eat a bag of @{what} worth 100ドル')
- self.assertEqual(s.substitute(dict(who='tim', what='ham')),
- 'tim likes to eat a bag of ham worth 100ドル')
-
 def test_idpattern_override(self):
 class PathPattern(Template):
 idpattern = r'[_a-z][._a-z0-9]*'
@@ -183,6 +176,12 @@
 raises(ValueError, s.substitute, dict(gift='bud', who='you'))
 eq(s.safe_substitute(), 'this &gift is for &{who} &')
 
+ class PieDelims(Template):
+ delimiter = '@'
+ s = PieDelims('@who likes to eat a bag of @{what} worth 100ドル')
+ self.assertEqual(s.substitute(dict(who='tim', what='ham')),
+ 'tim likes to eat a bag of ham worth 100ドル')
+
 
 def test_main():
 from test import support
Modified: python/branches/py3k/Lib/test/test_platform.py
==============================================================================
--- python/branches/py3k/Lib/test/test_platform.py	(original)
+++ python/branches/py3k/Lib/test/test_platform.py	Sun Mar 14 11:23:39 2010
@@ -175,8 +175,10 @@
 if os.path.isdir(sys.executable) and \
 os.path.exists(sys.executable+'.exe'):
 # Cygwin horror
- executable = executable + '.exe'
- res = platform.libc_ver(sys.executable)
+ executable = sys.executable + '.exe'
+ else:
+ executable = sys.executable
+ res = platform.libc_ver(executable)
 
 def test_parse_release_file(self):
 
Modified: python/branches/py3k/Lib/test/test_posixpath.py
==============================================================================
--- python/branches/py3k/Lib/test/test_posixpath.py	(original)
+++ python/branches/py3k/Lib/test/test_posixpath.py	Sun Mar 14 11:23:39 2010
@@ -2,7 +2,7 @@
 from test import support, test_genericpath
 
 import posixpath, os
-from posixpath import realpath, abspath, join, dirname, basename, relpath
+from posixpath import realpath, abspath, dirname, basename
 
 # An absolute path to a temporary filename for testing. We can't rely on TESTFN
 # being an absolute path, so we need this.
Modified: python/branches/py3k/Lib/test/test_richcmp.py
==============================================================================
--- python/branches/py3k/Lib/test/test_richcmp.py	(original)
+++ python/branches/py3k/Lib/test/test_richcmp.py	Sun Mar 14 11:23:39 2010
@@ -192,12 +192,12 @@
 
 def test_misbehavin(self):
 class Misb:
- def __lt__(self, other): return 0
- def __gt__(self, other): return 0
- def __eq__(self, other): return 0
- def __le__(self, other): raise TestFailed("This shouldn't happen")
- def __ge__(self, other): raise TestFailed("This shouldn't happen")
- def __ne__(self, other): raise TestFailed("This shouldn't happen")
+ def __lt__(self_, other): return 0
+ def __gt__(self_, other): return 0
+ def __eq__(self_, other): return 0
+ def __le__(self_, other): self.fail("This shouldn't happen")
+ def __ge__(self_, other): self.fail("This shouldn't happen")
+ def __ne__(self_, other): self.fail("This shouldn't happen")
 a = Misb()
 b = Misb()
 self.assertEqual(a<b, 0)
Modified: python/branches/py3k/Lib/test/test_ssl.py
==============================================================================
--- python/branches/py3k/Lib/test/test_ssl.py	(original)
+++ python/branches/py3k/Lib/test/test_ssl.py	Sun Mar 14 11:23:39 2010
@@ -1063,9 +1063,9 @@
 ssl_version=ssl.PROTOCOL_TLSv1)
 s.connect((HOST, server.port))
 except ssl.SSLError as x:
- raise support.TestFailed("Unexpected SSL error: " + str(x))
+ self.fail("Unexpected SSL error: " + str(x))
 except Exception as x:
- raise support.TestFailed("Unexpected exception: " + str(x))
+ self.fail("Unexpected exception: " + str(x))
 else:
 # helper methods for standardising recv* method signatures
 def _recv_into():
@@ -1099,7 +1099,7 @@
 outdata = s.read()
 outdata = str(outdata, 'ASCII', 'strict')
 if outdata != indata.lower():
- raise support.TestFailed(
+ self.fail(
 "While sending with <<{name:s}>> bad data "
 "<<{outdata:s}>> ({nout:d}) received; "
 "expected <<{indata:s}>> ({nin:d})\n".format(
@@ -1110,12 +1110,12 @@
 )
 except ValueError as e:
 if expect_success:
- raise support.TestFailed(
+ self.fail(
 "Failed to send with method <<{name:s}>>; "
 "expected to succeed.\n".format(name=meth_name)
 )
 if not str(e).startswith(meth_name):
- raise support.TestFailed(
+ self.fail(
 "Method <<{name:s}>> failed with unexpected "
 "exception message: {exp:s}\n".format(
 name=meth_name, exp=e
@@ -1129,7 +1129,7 @@
 outdata = recv_meth(*args)
 outdata = str(outdata, 'ASCII', 'strict')
 if outdata != indata.lower():
- raise support.TestFailed(
+ self.fail(
 "While receiving with <<{name:s}>> bad data "
 "<<{outdata:s}>> ({nout:d}) received; "
 "expected <<{indata:s}>> ({nin:d})\n".format(
@@ -1140,12 +1140,12 @@
 )
 except ValueError as e:
 if expect_success:
- raise support.TestFailed(
+ self.fail(
 "Failed to receive with method <<{name:s}>>; "
 "expected to succeed.\n".format(name=meth_name)
 )
 if not str(e).startswith(meth_name):
- raise support.TestFailed(
+ self.fail(
 "Method <<{name:s}>> failed with unexpected "
 "exception message: {exp:s}\n".format(
 name=meth_name, exp=e
Modified: python/branches/py3k/Lib/test/test_sysconfig.py
==============================================================================
--- python/branches/py3k/Lib/test/test_sysconfig.py	(original)
+++ python/branches/py3k/Lib/test/test_sysconfig.py	Sun Mar 14 11:23:39 2010
@@ -9,6 +9,7 @@
 import test
 import os
 import subprocess
+import shutil
 from copy import copy, deepcopy
 
 from test.support import run_unittest, TESTFN, unlink, get_attribute
Modified: python/branches/py3k/Lib/test/test_tempfile.py
==============================================================================
--- python/branches/py3k/Lib/test/test_tempfile.py	(original)
+++ python/branches/py3k/Lib/test/test_tempfile.py	Sun Mar 14 11:23:39 2010
@@ -127,7 +127,7 @@
 if i == 20:
 break
 except:
- failOnException("iteration")
+ self.failOnException("iteration")
 
 test_classes.append(test__RandomNameSequence)
 
Modified: python/branches/py3k/Lib/test/test_threaded_import.py
==============================================================================
--- python/branches/py3k/Lib/test/test_threaded_import.py	(original)
+++ python/branches/py3k/Lib/test/test_threaded_import.py	Sun Mar 14 11:23:39 2010
@@ -6,6 +6,7 @@
 # randrange, and then Python hangs.
 
 import _thread as thread
+import unittest
 from test.support import verbose, TestFailed
 
 critical_section = thread.allocate_lock()
Modified: python/branches/py3k/Lib/test/test_zipimport.py
==============================================================================
--- python/branches/py3k/Lib/test/test_zipimport.py	(original)
+++ python/branches/py3k/Lib/test/test_zipimport.py	Sun Mar 14 11:23:39 2010
@@ -227,7 +227,7 @@
 
 mod_path = packdir2 + TESTMOD
 mod_name = module_path_to_dotted_name(mod_path)
- pkg = __import__(mod_name)
+ __import__(mod_name)
 mod = sys.modules[mod_name]
 self.assertEquals(zi.get_source(TESTPACK), None)
 self.assertEquals(zi.get_source(mod_path), None)
@@ -271,7 +271,7 @@
 
 mod_path = TESTPACK2 + os.sep + TESTMOD
 mod_name = module_path_to_dotted_name(mod_path)
- pkg = __import__(mod_name)
+ __import__(mod_name)
 mod = sys.modules[mod_name]
 self.assertEquals(zi.get_source(TESTPACK2), None)
 self.assertEquals(zi.get_source(mod_path), None)
Modified: python/branches/py3k/Lib/unittest/case.py
==============================================================================
--- python/branches/py3k/Lib/unittest/case.py	(original)
+++ python/branches/py3k/Lib/unittest/case.py	Sun Mar 14 11:23:39 2010
@@ -96,7 +96,7 @@
 self.obj_name = str(callable_obj)
 else:
 self.obj_name = None
- self.expected_regex = expected_regexp
+ self.expected_regexp = expected_regexp
 
 def __enter__(self):
 return self
@@ -118,10 +118,10 @@
 return False
 # store exception, without traceback, for later retrieval
 self.exception = exc_value.with_traceback(None)
- if self.expected_regex is None:
+ if self.expected_regexp is None:
 return True
 
- expected_regexp = self.expected_regex
+ expected_regexp = self.expected_regexp
 if isinstance(expected_regexp, (bytes, str)):
 expected_regexp = re.compile(expected_regexp)
 if not expected_regexp.search(str(exc_value)):
@@ -865,12 +865,12 @@
 with context:
 callable_obj(*args, **kwargs)
 
- def assertRegexpMatches(self, text, expected_regex, msg=None):
- if isinstance(expected_regex, (str, bytes)):
- expected_regex = re.compile(expected_regex)
- if not expected_regex.search(text):
+ def assertRegexpMatches(self, text, expected_regexp, msg=None):
+ if isinstance(expected_regexp, (str, bytes)):
+ expected_regexp = re.compile(expected_regexp)
+ if not expected_regexp.search(text):
 msg = msg or "Regexp didn't match"
- msg = '%s: %r not found in %r' % (msg, expected_regex.pattern, text)
+ msg = '%s: %r not found in %r' % (msg, expected_regexp.pattern, text)
 raise self.failureException(msg)
 
 
