diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-01-20 15:14:11 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-01-20 15:14:11 (GMT) |
| commit | 9bd667ad030913ead3a789f45e73c26f9f28fb46 (patch) | |
| tree | ea9c145cdcc74d4f1b0b084b083f9286a878c513 /Lib/test/test_operator.py | |
| parent | 78b11870a4c441e42cf60dca3a6d22f5896311ba (diff) | |
| download | cpython-9bd667ad030913ead3a789f45e73c26f9f28fb46.zip cpython-9bd667ad030913ead3a789f45e73c26f9f28fb46.tar.gz cpython-9bd667ad030913ead3a789f45e73c26f9f28fb46.tar.bz2 | |
Merged revisions 60124-60142 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60131 | georg.brandl | 2008-01-20 12:13:29 +0100 (Sun, 20 Jan 2008) | 3 lines
#1351692: in pprint, always call format() for dict and list items to enable
custom formatting of contents via subclassing PrettyPrinter.
........
r60133 | georg.brandl | 2008-01-20 12:43:03 +0100 (Sun, 20 Jan 2008) | 2 lines
#1178141: add addinfourl.code to get http status code from urllib.
........
r60134 | georg.brandl | 2008-01-20 13:05:43 +0100 (Sun, 20 Jan 2008) | 4 lines
#856047: respect the ``no_proxy`` env var when checking for proxies
in urllib and using the other ``_proxy`` env vars.
Original patch by Donovan Baarda.
........
r60135 | georg.brandl | 2008-01-20 13:18:17 +0100 (Sun, 20 Jan 2008) | 4 lines
#1664522: in urllib, don't read non-existing directories in ftp mode,
returning a 0-byte file -- raise an IOError instead.
Original patch from Phil Knirsch.
........
r60136 | georg.brandl | 2008-01-20 13:57:47 +0100 (Sun, 20 Jan 2008) | 2 lines
#799369: document possible sys.platform values.
........
r60137 | georg.brandl | 2008-01-20 14:08:37 +0100 (Sun, 20 Jan 2008) | 2 lines
#652749: document the constants added to the builtins by site.py.
........
r60138 | georg.brandl | 2008-01-20 14:59:46 +0100 (Sun, 20 Jan 2008) | 2 lines
#1648: add sys.gettrace() and sys.getprofile().
........
r60139 | georg.brandl | 2008-01-20 15:17:42 +0100 (Sun, 20 Jan 2008) | 2 lines
#1669: don't allow shutil.rmtree() to be called on a symlink.
........
r60140 | georg.brandl | 2008-01-20 15:20:02 +0100 (Sun, 20 Jan 2008) | 2 lines
Fix test_pyclbr after urllib change.
........
r60141 | christian.heimes | 2008-01-20 15:28:28 +0100 (Sun, 20 Jan 2008) | 1 line
Fixed a wrong assumption in configure.in and Include/pyport.h. The is finite function is not called isfinite() but finite(). Sorry, my fault. :)
........
r60142 | georg.brandl | 2008-01-20 15:31:27 +0100 (Sun, 20 Jan 2008) | 2 lines
#1876: fix typos in test_operator.
........
Diffstat (limited to 'Lib/test/test_operator.py')
| -rw-r--r-- | Lib/test/test_operator.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/test/test_operator.py b/Lib/test/test_operator.py index 57f3846..dbb8f9e 100644 --- a/Lib/test/test_operator.py +++ b/Lib/test/test_operator.py @@ -364,9 +364,9 @@ class OperatorTestCase(unittest.TestCase): self.assertRaises(TypeError, operator.attrgetter('x', (), 'y'), record) class C(object): - def __getattr(self, name): + def __getattr__(self, name): raise SyntaxError - self.failUnlessRaises(AttributeError, operator.attrgetter('foo'), C()) + self.failUnlessRaises(SyntaxError, operator.attrgetter('foo'), C()) def test_itemgetter(self): a = 'ABCDE' @@ -376,9 +376,9 @@ class OperatorTestCase(unittest.TestCase): self.assertRaises(IndexError, f, a) class C(object): - def __getitem(self, name): + def __getitem__(self, name): raise SyntaxError - self.failUnlessRaises(TypeError, operator.itemgetter(42), C()) + self.failUnlessRaises(SyntaxError, operator.itemgetter(42), C()) f = operator.itemgetter('name') self.assertRaises(TypeError, f, a) |