diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-01-24 16:21:45 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-01-24 16:21:45 (GMT) |
| commit | e7a15bb808f2118920fed0b5949f821940cf7416 (patch) | |
| tree | 5b7015f62adf9b7c934f3b9aa83e80e5d7efa929 /Lib/test | |
| parent | e83ebd9ab10adc43b0e6368c6985a4a90a85747f (diff) | |
| download | cpython-e7a15bb808f2118920fed0b5949f821940cf7416.zip cpython-e7a15bb808f2118920fed0b5949f821940cf7416.tar.gz cpython-e7a15bb808f2118920fed0b5949f821940cf7416.tar.bz2 | |
Merged revisions 60234-60244 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60234 | gregory.p.smith | 2008-01-24 10:38:26 +0100 (Thu, 24 Jan 2008) | 4 lines
Fix issue1789: The tutorial contained a misuse of the struct module.
(also remove an unneeded import struct from test_largefile)
........
r60237 | vinay.sajip | 2008-01-24 13:37:08 +0100 (Thu, 24 Jan 2008) | 1 line
Added optional delay argument to FileHandler and subclasses.
........
r60238 | vinay.sajip | 2008-01-24 13:37:33 +0100 (Thu, 24 Jan 2008) | 1 line
Added optional delay argument to FileHandler and subclasses.
........
r60239 | vinay.sajip | 2008-01-24 13:38:30 +0100 (Thu, 24 Jan 2008) | 1 line
Added documentation for optional delay argument to FileHandler and subclasses.
........
r60240 | vinay.sajip | 2008-01-24 13:43:33 +0100 (Thu, 24 Jan 2008) | 1 line
Updated for optional delay argument to FileHandler and subclasses.
........
r60243 | guido.van.rossum | 2008-01-24 16:53:22 +0100 (Thu, 24 Jan 2008) | 2 lines
Fi debug turd -- a call accidentally left out.
........
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_descr.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_largefile.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 7ef702b..028be3d 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -4249,7 +4249,7 @@ def test_borrowed_ref_4_segfault(): builtins.__import__ = orig_import def test_main(): - #XXXweakref_segfault() # Must be first, somehow + weakref_segfault() # Must be first, somehow wrapper_segfault() # NB This one is slow do_this_first() class_docstrings() diff --git a/Lib/test/test_largefile.py b/Lib/test/test_largefile.py index a54a833..6d2e27d 100644 --- a/Lib/test/test_largefile.py +++ b/Lib/test/test_largefile.py @@ -6,7 +6,7 @@ #---------------------------------------------------------------------- from test import test_support -import os, struct, stat, sys +import os, stat, sys try: import signal |