[Python-checkins] r78083 - in python/branches/release26-maint: Lib/test/test_csv.py Lib/test/test_fnmatch.py Lib/test/test_functools.py Lib/test/test_optparse.py Lib/test/test_pep292.py

Sun Feb 7 14:02:11 CET 2010

Author: georg.brandl
Date: Sun Feb 7 14:02:10 2010
New Revision: 78083
Log:
Merged revisions 78075-78079 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 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().
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Lib/test/test_csv.py
 python/branches/release26-maint/Lib/test/test_fnmatch.py
 python/branches/release26-maint/Lib/test/test_functools.py
 python/branches/release26-maint/Lib/test/test_optparse.py
 python/branches/release26-maint/Lib/test/test_pep292.py
Modified: python/branches/release26-maint/Lib/test/test_csv.py
==============================================================================

--- python/branches/release26-maint/Lib/test/test_csv.py	(original)
+++ python/branches/release26-maint/Lib/test/test_csv.py	Sun Feb 7 14:02:10 2010
@@ -531,10 +531,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/release26-maint/Lib/test/test_fnmatch.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_fnmatch.py	(original)
+++ python/branches/release26-maint/Lib/test/test_fnmatch.py	Sun Feb 7 14:02:10 2010
@@ -44,6 +44,11 @@
 check('\nfoo', 'foo*', False)
 check('\n', '*')
 
+ def test_fnmatchcase(self):
+ check = self.check_match
+ check('AbC', 'abc', 0)
+ check('abc', 'AbC', 0)
+
 
 def test_main():
 test_support.run_unittest(FnmatchTestCase)
Modified: python/branches/release26-maint/Lib/test/test_functools.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_functools.py	(original)
+++ python/branches/release26-maint/Lib/test/test_functools.py	Sun Feb 7 14:02:10 2010
@@ -43,6 +43,14 @@
 self.assertRaises(TypeError, setattr, p, 'args', (1, 2))
 self.assertRaises(TypeError, 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
 try:
@@ -117,15 +125,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/release26-maint/Lib/test/test_optparse.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_optparse.py	(original)
+++ python/branches/release26-maint/Lib/test/test_optparse.py	Sun Feb 7 14:02:10 2010
@@ -459,7 +459,7 @@
 return int(value)
 else:
 return int(value[:-1]) * _time_units[value[-1]]
- except ValueError, IndexError:
+ except (ValueError, IndexError):
 raise OptionValueError(
 'option %s: invalid duration: %r' % (opt, value))
 
Modified: python/branches/release26-maint/Lib/test/test_pep292.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_pep292.py	(original)
+++ python/branches/release26-maint/Lib/test/test_pep292.py	Sun Feb 7 14:02:10 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 test_support
