Mailman 3 November 2010 - Python-checkins

Daily py3k reference leaks (r86870): sum=5
by solipsis＠pitrou.net Nov. 30, 2010

Nov. 30, 2010

py3k results for svn r86870 (hg cset 518abe538cf3) -------------------------------------------------- test_robotparser leaked [0, 5, 0] references, sum=5 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/py3k/refleaks/reflogeiDmk1', '-x']

1 0

r86877 - in python/branches/release27-maint: Lib/test/test_itertools.py Misc/NEWS Modules/itertoolsmodule.c
by raymond.hettinger Nov. 30, 2010

Nov. 30, 2010

Author: raymond.hettinger Date: Tue Nov 30 04:15:35 2010 New Revision: 86877 Log: Issue #10323: Predictable final state for slice(). Modified: python/branches/release27-maint/Lib/test/test_itertools.py python/branches/release27-maint/Misc/NEWS python/branches/release27-maint/Modules/itertoolsmodule.c Modified: python/branches/release27-maint/Lib/test/test_itertools.py ============================================================================== --- python/branches/release27-maint/Lib/test/test_itertools.py (original) +++ python/branches/release27-maint/Lib/test/test_itertools.py Tue Nov 30 04:15:35 2010 @@ -778,6 +778,11 @@ self.assertRaises(ValueError, islice, xrange(10), 1, 'a', 1) self.assertEqual(len(list(islice(count(), 1, 10, maxsize))), 1) + # Issue #10323: Less islice in a predictable state + c = count() + self.assertEqual(list(islice(c, 1, 3, 50)), [1]) + self.assertEqual(next(c), 3) + def test_takewhile(self): data = [1, 3, 5, 20, 2, 4, 6, 8] underten = lambda x: x<10 Modified: python/branches/release27-maint/Misc/NEWS ============================================================================== --- python/branches/release27-maint/Misc/NEWS (original) +++ python/branches/release27-maint/Misc/NEWS Tue Nov 30 04:15:35 2010 @@ -22,6 +22,10 @@ Library ------- +- Issue #10323: itertools.islice() now consumes the minimum number of + inputs before stopping. Formerly, the final state of the underlying + iterator was undefined. + - Issue #10565: The collections.Iterator ABC now checks for both ``__iter__`` and ``next``. Modified: python/branches/release27-maint/Modules/itertoolsmodule.c ============================================================================== --- python/branches/release27-maint/Modules/itertoolsmodule.c (original) +++ python/branches/release27-maint/Modules/itertoolsmodule.c Tue Nov 30 04:15:35 2010 @@ -1215,6 +1215,7 @@ { PyObject *item; PyObject *it = lz->it; + Py_ssize_t stop = lz->stop; Py_ssize_t oldnext; PyObject *(*iternext)(PyObject *); @@ -1226,7 +1227,7 @@ Py_DECREF(item); lz->cnt++; } - if (lz->stop != -1 && lz->cnt >= lz->stop) + if (stop != -1 && lz->cnt >= stop) return NULL; item = iternext(it); if (item == NULL) @@ -1234,8 +1235,8 @@ lz->cnt++; oldnext = lz->next; lz->next += lz->step; - if (lz->next < oldnext) /* Check for overflow */ - lz->next = lz->stop; + if (lz->next < oldnext || (stop != -1 && lz->next > stop)) + lz->next = stop; return item; }

1 0

r86876 - in python/branches/release31-maint: Lib/test/test_itertools.py Misc/NEWS Modules/itertoolsmodule.c
by raymond.hettinger Nov. 30, 2010

Nov. 30, 2010

Author: raymond.hettinger Date: Tue Nov 30 04:09:05 2010 New Revision: 86876 Log: Issue #10323: Predictable final state for slice(). Modified: python/branches/release31-maint/Lib/test/test_itertools.py python/branches/release31-maint/Misc/NEWS python/branches/release31-maint/Modules/itertoolsmodule.c Modified: python/branches/release31-maint/Lib/test/test_itertools.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_itertools.py (original) +++ python/branches/release31-maint/Lib/test/test_itertools.py Tue Nov 30 04:09:05 2010 @@ -788,6 +788,11 @@ self.assertRaises(ValueError, islice, range(10), 1, 'a', 1) self.assertEqual(len(list(islice(count(), 1, 10, maxsize))), 1) + # Issue #10323: Less islice in a predictable state + c = count() + self.assertEqual(list(islice(c, 1, 3, 50)), [1]) + self.assertEqual(next(c), 3) + def test_takewhile(self): data = [1, 3, 5, 20, 2, 4, 6, 8] underten = lambda x: x<10 Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Tue Nov 30 04:09:05 2010 @@ -28,6 +28,10 @@ Library ------- +- Issue #10323: itertools.islice() now consumes the minimum number of + inputs before stopping. Formerly, the final state of the underlying + iterator was undefined. + - Issue #10565: The collections.Iterator ABC now checks for both __iter__ and __next__. Modified: python/branches/release31-maint/Modules/itertoolsmodule.c ============================================================================== --- python/branches/release31-maint/Modules/itertoolsmodule.c (original) +++ python/branches/release31-maint/Modules/itertoolsmodule.c Tue Nov 30 04:09:05 2010 @@ -1215,6 +1215,7 @@ { PyObject *item; PyObject *it = lz->it; + Py_ssize_t stop = lz->stop; Py_ssize_t oldnext; PyObject *(*iternext)(PyObject *); @@ -1226,7 +1227,7 @@ Py_DECREF(item); lz->cnt++; } - if (lz->stop != -1 && lz->cnt >= lz->stop) + if (stop != -1 && lz->cnt >= stop) return NULL; item = iternext(it); if (item == NULL) @@ -1234,8 +1235,8 @@ lz->cnt++; oldnext = lz->next; lz->next += lz->step; - if (lz->next < oldnext) /* Check for overflow */ - lz->next = lz->stop; + if (lz->next < oldnext || (stop != -1 && lz->next > stop)) + lz->next = stop; return item; }

1 0

r86875 - in python/branches/py3k: Lib/json/tests Lib/test/json_tests Lib/test/json_tests/__init__.py Lib/test/test_json.py Makefile.pre.in
by alexander.belopolsky Nov. 30, 2010

Nov. 30, 2010

Author: alexander.belopolsky Date: Tue Nov 30 04:03:30 2010 New Revision: 86875 Log: Issue #10572: Moved json tests to Lib/test/json_tests. Approved by Raymond Hettinger. Added: python/branches/py3k/Lib/test/json_tests/ - copied from r86873, /python/branches/py3k/Lib/json/tests/ Removed: python/branches/py3k/Lib/json/tests/ Modified: python/branches/py3k/Lib/test/json_tests/__init__.py python/branches/py3k/Lib/test/test_json.py python/branches/py3k/Makefile.pre.in Modified: python/branches/py3k/Lib/test/json_tests/__init__.py ============================================================================== --- /python/branches/py3k/Lib/json/tests/__init__.py (original) +++ python/branches/py3k/Lib/test/json_tests/__init__.py Tue Nov 30 04:03:30 2010 @@ -10,7 +10,7 @@ loader = unittest.TestLoader() for fn in os.listdir(here): if fn.startswith("test") and fn.endswith(".py"): - modname = "json.tests." + fn[:-3] + modname = "test.json_tests." + fn[:-3] __import__(modname) module = sys.modules[modname] suite.addTests(loader.loadTestsFromModule(module)) Modified: python/branches/py3k/Lib/test/test_json.py ============================================================================== --- python/branches/py3k/Lib/test/test_json.py (original) +++ python/branches/py3k/Lib/test/test_json.py Tue Nov 30 04:03:30 2010 @@ -5,12 +5,12 @@ be run. """ -import json.tests +from test import json_tests import test.support def test_main(): - test.support.run_unittest(json.tests.test_suite()) + test.support.run_unittest(json_tests.test_suite()) if __name__ == "__main__": Modified: python/branches/py3k/Makefile.pre.in ============================================================================== --- python/branches/py3k/Makefile.pre.in (original) +++ python/branches/py3k/Makefile.pre.in Tue Nov 30 04:03:30 2010 @@ -890,7 +890,7 @@ test/tracedmodules test/encoded_modules \ concurrent concurrent/futures encodings \ email email/mime email/test email/test/data \ - html json json/tests http dbm xmlrpc \ + html json test/json_tests http dbm xmlrpc \ sqlite3 sqlite3/test \ logging csv wsgiref urllib \ lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \

1 0

r86874 - in python/branches/py3k: Lib/test/test_itertools.py Misc/NEWS Modules/itertoolsmodule.c
by raymond.hettinger Nov. 30, 2010

Nov. 30, 2010

Author: raymond.hettinger Date: Tue Nov 30 03:49:29 2010 New Revision: 86874 Log: Issue #10323: Predictable final state for slice(). Modified: python/branches/py3k/Lib/test/test_itertools.py python/branches/py3k/Misc/NEWS python/branches/py3k/Modules/itertoolsmodule.c Modified: python/branches/py3k/Lib/test/test_itertools.py ============================================================================== --- python/branches/py3k/Lib/test/test_itertools.py (original) +++ python/branches/py3k/Lib/test/test_itertools.py Tue Nov 30 03:49:29 2010 @@ -788,6 +788,11 @@ self.assertRaises(ValueError, islice, range(10), 1, 'a', 1) self.assertEqual(len(list(islice(count(), 1, 10, maxsize))), 1) + # Issue #10323: Less islice in a predictable state + c = count() + self.assertEqual(list(islice(c, 1, 3, 50)), [1]) + self.assertEqual(next(c), 3) + def test_takewhile(self): data = [1, 3, 5, 20, 2, 4, 6, 8] underten = lambda x: x<10 Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Tue Nov 30 03:49:29 2010 @@ -43,6 +43,10 @@ Library ------- +- Issue #10323: itertools.islice() now consumes the minimum number of + inputs before stopping. Formerly, the final state of the underlying + iterator was undefined. + - Issue #10565: The collections.Iterator ABC now checks for both __iter__ and __next__. Modified: python/branches/py3k/Modules/itertoolsmodule.c ============================================================================== --- python/branches/py3k/Modules/itertoolsmodule.c (original) +++ python/branches/py3k/Modules/itertoolsmodule.c Tue Nov 30 03:49:29 2010 @@ -1215,6 +1215,7 @@ { PyObject *item; PyObject *it = lz->it; + Py_ssize_t stop = lz->stop; Py_ssize_t oldnext; PyObject *(*iternext)(PyObject *); @@ -1226,7 +1227,7 @@ Py_DECREF(item); lz->cnt++; } - if (lz->stop != -1 && lz->cnt >= lz->stop) + if (stop != -1 && lz->cnt >= stop) return NULL; item = iternext(it); if (item == NULL) @@ -1234,8 +1235,8 @@ lz->cnt++; oldnext = lz->next; lz->next += lz->step; - if (lz->next < oldnext) /* Check for overflow */ - lz->next = lz->stop; + if (lz->next < oldnext || (stop != -1 && lz->next > stop)) + lz->next = stop; return item; }

1 0

r86873 - in python/branches/release27-maint: Lib/_abcoll.py Lib/test/test_collections.py Misc/NEWS
by alexander.belopolsky Nov. 30, 2010

Nov. 30, 2010

Author: alexander.belopolsky Date: Tue Nov 30 02:18:17 2010 New Revision: 86873 Log: Merged revisions 86857 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86857 | raymond.hettinger | 2010-11-28 22:56:12 -0500 (Sun, 28 Nov 2010) | 1 line Issue #10565: Iterator ABC should require both __next__ and __iter__. ........ Modified: python/branches/release27-maint/ (props changed) python/branches/release27-maint/Lib/_abcoll.py python/branches/release27-maint/Lib/test/test_collections.py python/branches/release27-maint/Misc/NEWS Modified: python/branches/release27-maint/Lib/_abcoll.py ============================================================================== --- python/branches/release27-maint/Lib/_abcoll.py (original) +++ python/branches/release27-maint/Lib/_abcoll.py Tue Nov 30 02:18:17 2010 @@ -82,7 +82,7 @@ @classmethod def __subclasshook__(cls, C): if cls is Iterator: - if _hasattr(C, "next"): + if _hasattr(C, "next") and _hasattr(C, "__iter__"): return True return NotImplemented Modified: python/branches/release27-maint/Lib/test/test_collections.py ============================================================================== --- python/branches/release27-maint/Lib/test/test_collections.py (original) +++ python/branches/release27-maint/Lib/test/test_collections.py Tue Nov 30 02:18:17 2010 @@ -355,8 +355,19 @@ for x in samples: self.assertIsInstance(x, Iterator) self.assertTrue(issubclass(type(x), Iterator), repr(type(x))) - self.validate_abstract_methods(Iterator, 'next') - self.validate_isinstance(Iterator, 'next') + self.validate_abstract_methods(Iterator, 'next', '__iter__') + + # Issue 10565 + class NextOnly: + def __next__(self): + yield 1 + raise StopIteration + self.assertNotIsInstance(NextOnly(), Iterator) + class NextOnlyNew(object): + def __next__(self): + yield 1 + raise StopIteration + self.assertNotIsInstance(NextOnlyNew(), Iterator) def test_Sized(self): non_samples = [None, 42, 3.14, 1j, Modified: python/branches/release27-maint/Misc/NEWS ============================================================================== --- python/branches/release27-maint/Misc/NEWS (original) +++ python/branches/release27-maint/Misc/NEWS Tue Nov 30 02:18:17 2010 @@ -22,6 +22,9 @@ Library ------- +- Issue #10565: The collections.Iterator ABC now checks for both + ``__iter__`` and ``next``. + - Issue #10092: Properly reset locale in calendar.Locale*Calendar classes. - Issue #10459: Update CJK character names to Unicode 5.2.

1 0

r86872 - in python/branches/release31-maint: Lib/_abcoll.py Lib/test/test_collections.py Misc/NEWS
by alexander.belopolsky Nov. 30, 2010

Nov. 30, 2010

Author: alexander.belopolsky Date: Tue Nov 30 02:01:02 2010 New Revision: 86872 Log: Merged revisions 86857 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86857 | raymond.hettinger | 2010-11-28 22:56:12 -0500 (Sun, 28 Nov 2010) | 1 line Issue #10565: Iterator ABC should require both __next__ and __iter__. ........ Modified: python/branches/release31-maint/Lib/_abcoll.py python/branches/release31-maint/Lib/test/test_collections.py python/branches/release31-maint/Misc/NEWS Modified: python/branches/release31-maint/Lib/_abcoll.py ============================================================================== --- python/branches/release31-maint/Lib/_abcoll.py (original) +++ python/branches/release31-maint/Lib/_abcoll.py Tue Nov 30 02:01:02 2010 @@ -90,7 +90,8 @@ @classmethod def __subclasshook__(cls, C): if cls is Iterator: - if any("__next__" in B.__dict__ for B in C.__mro__): + if (any("__next__" in B.__dict__ for B in C.__mro__) and + any("__iter__" in B.__dict__ for B in C.__mro__)): return True return NotImplemented Modified: python/branches/release31-maint/Lib/test/test_collections.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_collections.py (original) +++ python/branches/release31-maint/Lib/test/test_collections.py Tue Nov 30 02:01:02 2010 @@ -328,7 +328,14 @@ for x in samples: self.assertTrue(isinstance(x, Iterator), repr(x)) self.assertTrue(issubclass(type(x), Iterator), repr(type(x))) - self.validate_abstract_methods(Iterator, '__next__') + self.validate_abstract_methods(Iterator, '__next__', '__iter__') + + # Issue 10565 + class NextOnly: + def __next__(self): + yield 1 + raise StopIteration + self.assertFalse(isinstance(NextOnly(), Iterator)) def test_Sized(self): non_samples = [None, 42, 3.14, 1j, Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Tue Nov 30 02:01:02 2010 @@ -28,6 +28,9 @@ Library ------- +- Issue #10565: The collections.Iterator ABC now checks for both + __iter__ and __next__. + - Issue #10561: In pdb, clear the breakpoints by the breakpoint number. - Issue #10459: Update CJK character names to Unicode 5.1.

1 0

Python Regression Test Failures opt (1)
by Neal Norwitz Nov. 29, 2010

Nov. 29, 2010

346 tests OK. 1 test failed: test_urllib2 37 tests skipped: test_aepack test_al test_applesingle test_bsddb185 test_bsddb3 test_cd test_cl test_curses test_epoll test_gdb test_gl test_imgfile test_ioctl test_kqueue test_linuxaudiodev test_macos test_macostools test_multiprocessing test_ossaudiodev test_pep277 test_py3kwarn test_scriptpackages test_smtpnet test_socketserver test_startfile test_sunaudiodev test_tcl test_timeout test_tk test_ttk_guionly test_ttk_textonly test_unicode_file test_urllib2net test_urllibnet test_winreg test_winsound test_zipfile64 7 skips unexpected on linux2: test_epoll test_gdb test_ioctl test_multiprocessing test_tk test_ttk_guionly test_ttk_textonly == CPython 2.7 (trunk:86870M, Nov 29 2010, 16:03:27) [GCC 3.3.4 20040623 (Gentoo Linux 3.3.4-r1, ssp-3.3.2-2, pie-8.7.6)] == Linux-2.6.9-gentoo-r1-i686-AMD_Athlon-tm-_XP_3000+-with-gentoo-1.4.16 little-endian == /tmp/test_python_8191 test_grammar test_opcodes test_dict test_builtin test_exceptions test_types test_unittest test_doctest test_doctest2 test_MimeWriter test_SimpleHTTPServer test_StringIO test___all__ test___future__ test__locale test_abc test_abstract_numbers test_aepack test_aepack skipped -- No module named aetypes test_aifc test_al test_al skipped -- No module named al test_anydbm test_applesingle test_applesingle skipped -- No module named MacOS test_argparse test_array test_ascii_formatd test_ast test_asynchat test_asyncore test_atexit test_audioop test_augassign test_base64 test_bastion test_bigaddrspace test_bigmem test_binascii test_binhex test_binop test_bisect test_bool test_bsddb test_bsddb185 test_bsddb185 skipped -- No module named bsddb185 test_bsddb3 test_bsddb3 skipped -- Use of the `bsddb' resource not enabled test_buffer test_bufio test_bytes test_bz2 test_calendar test_call test_capi test_cd test_cd skipped -- No module named cd test_cfgparser test_cgi test_charmapcodec test_cl test_cl skipped -- No module named cl test_class test_cmath test_cmd test_cmd_line test_cmd_line_script test_code test_codeccallbacks test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecmaps_cn test_codecmaps_hk test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_codecs test_codeop test_coding test_coercion test_collections test_colorsys test_commands test_compare test_compile test_compileall test_compiler test_complex test_complex_args test_contains test_contextlib test_cookie test_cookielib test_copy test_copy_reg test_cpickle test_cprofile test_crypt test_csv test_ctypes test_curses test_curses skipped -- Use of the `curses' resource not enabled test_datetime test_dbm test_decimal test_decorators test_defaultdict test_deque test_descr test_descrtut test_dictcomps test_dictviews test_difflib test_dircache test_dis test_distutils [19646 refs] [19646 refs] [19646 refs] [19646 refs] [19643 refs] test_dl test_docxmlrpc test_dumbdbm test_dummy_thread test_dummy_threading test_email test_email_codecs test_email_renamed test_enumerate test_eof test_epoll test_epoll skipped -- kernel doesn't support epoll() test_errno test_exception_variations test_extcall test_fcntl test_file test_file2k test_filecmp test_fileinput test_fileio test_float test_fnmatch test_fork1 test_format test_fpformat test_fractions test_frozen test_ftplib test_funcattrs test_functools test_future test_future3 test_future4 test_future5 test_future_builtins test_gc test_gdb test_gdb skipped -- gdb versions before 7.0 didn't support python embedding Saw: GNU gdb 6.2.1 Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type "show copying" to see the conditions. There is absolutely no warranty for GDB. Type "show warranty" for details. This GDB was configured as "i386-pc-linux-gnu". test_gdbm test_generators test_genericpath test_genexps test_getargs test_getargs2 test_getopt test_gettext test_gl test_gl skipped -- No module named gl test_glob test_global test_grp test_gzip test_hash test_hashlib test_heapq test_hmac test_hotshot test_htmllib test_htmlparser test_httplib test_httpservers [15648 refs] [15648 refs] [15648 refs] [25315 refs] test_imageop test_imaplib test_imgfile test_imgfile skipped -- No module named imgfile test_imp test_import test_importhooks test_importlib test_index test_inspect test_int test_int_literal test_io test_ioctl test_ioctl skipped -- Unable to open /dev/tty test_isinstance test_iter test_iterlen test_itertools test_json test_kqueue test_kqueue skipped -- test works only on BSD test_largefile test_lib2to3 test_linecache test_linuxaudiodev test_linuxaudiodev skipped -- Use of the `audio' resource not enabled test_list test_locale test_logging test_long test_long_future test_longexp test_macos test_macos skipped -- No module named MacOS test_macostools test_macostools skipped -- No module named MacOS test_macpath test_mailbox test_marshal test_math test_md5 test_memoryio test_memoryview test_mhlib test_mimetools test_mimetypes test_minidom test_mmap test_module test_modulefinder test_multibytecodec test_multibytecodec_support test_multifile test_multiprocessing test_multiprocessing skipped -- This platform lacks a functioning sem_open implementation, therefore, the required synchronization primitives needed will not function, see issue 3770. test_mutants test_mutex test_netrc test_new test_nis test_normalization test_ntpath test_old_mailbox test_openpty test_operator test_optparse test_os [15648 refs] [15648 refs] test_ossaudiodev test_ossaudiodev skipped -- Use of the `audio' resource not enabled test_parser Expecting 's_push: parser stack overflow' in next line s_push: parser stack overflow test_pdb test_peepholer test_pep247 test_pep263 test_pep277 test_pep277 skipped -- only NT+ and systems with Unicode-friendly filesystem encoding test_pep292 test_pep352 test_pickle test_pickletools test_pipes test_pkg test_pkgimport test_pkgutil test_platform [17044 refs] [17044 refs] test_plistlib test_poll test_popen [15653 refs] [15653 refs] [15653 refs] test_popen2 test_poplib test_posix test_posixpath test_pow test_pprint test_print test_profile test_profilehooks test_property test_pstats test_pty test_pwd test_py3kwarn test_py3kwarn skipped -- test.test_py3kwarn must be run with the -3 flag test_pyclbr test_pydoc [20862 refs] [20862 refs] [20862 refs] [20862 refs] [20862 refs] [20861 refs] [20861 refs] test_pyexpat test_queue test_quopri [18479 refs] [18479 refs] test_random test_re test_readline test_repr test_resource test_rfc822 test_richcmp test_robotparser test_runpy test_sax test_scope test_scriptpackages test_scriptpackages skipped -- No module named aetools test_select test_set test_setcomps test_sets test_sgmllib test_sha test_shelve test_shlex test_shutil test_signal test_site [15648 refs] [15648 refs] [15648 refs] [15648 refs] test_slice test_smtplib test_smtpnet test_smtpnet skipped -- Use of the `network' resource not enabled test_socket test_socketserver test_socketserver skipped -- Use of the `network' resource not enabled test_softspace test_sort test_sqlite test_ssl test_startfile test_startfile skipped -- module os has no attribute startfile test_str test_strftime test_string test_stringprep test_strop test_strptime test_strtod test_struct test_structmembers test_structseq test_subprocess [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15863 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] . [15648 refs] [15648 refs] this bit of output is from a test of stdout in a different process ... [15648 refs] [15648 refs] [15863 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15863 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] [15648 refs] . [15648 refs] [15648 refs] this bit of output is from a test of stdout in a different process ... [15648 refs] [15648 refs] [15863 refs] test_sunaudiodev test_sunaudiodev skipped -- No module named sunaudiodev test_sundry test_symtable test_syntax test_sys [15648 refs] [15648 refs] [15648 refs] [15877 refs] [15671 refs] test_sysconfig [15648 refs] [15648 refs] test_tarfile test_tcl test_tcl skipped -- No module named _tkinter test_telnetlib test_tempfile [15648 refs] test_textwrap test_thread test_threaded_import test_threadedtempfile test_threading [18948 refs] [21123 refs] [20035 refs] [20035 refs] [20035 refs] [20035 refs] test_threading_local test_threadsignals test_time test_timeout test_timeout skipped -- Use of the `network' resource not enabled test_tk test_tk skipped -- No module named _tkinter test_tokenize test_trace test_traceback test_transformer test_ttk_guionly test_ttk_guionly skipped -- No module named _tkinter test_ttk_textonly test_ttk_textonly skipped -- No module named _tkinter test_tuple test_typechecks test_ucn test_unary test_undocumented_details test_unicode test_unicode_file test_unicode_file skipped -- No Unicode filesystem semantics on this platform. test_unicodedata test_univnewlines test_univnewlines2k test_unpack test_urllib test_urllib2 test test_urllib2 failed -- Traceback (most recent call last): File "/tmp/python-test/local/lib/python2.7/test/test_urllib2.py", line 711, in test_file h.file_open, Request(url)) File "/tmp/python-test/local/lib/python2.7/unittest/case.py", line 456, in assertRaises callableObj(*args, **kwargs) File "/tmp/python-test/local/lib/python2.7/urllib2.py", line 1269, in file_open return self.open_local_file(req) File "/tmp/python-test/local/lib/python2.7/urllib2.py", line 1301, in open_local_file (not port and socket.gethostbyname(host) in self.get_names()): gaierror: [Errno -2] Name or service not known Re-running test 'test_urllib2' in verbose mode Trying: mgr = urllib2.HTTPPasswordMgr() Expecting nothing ok Trying: add = mgr.add_password Expecting nothing ok Trying: add("Some Realm", "http://example.com/", "joe", "password") Expecting nothing ok Trying: add("Some Realm", "http://example.com/ni", "ni", "ni") Expecting nothing ok Trying: add("c", "http://example.com/foo", "foo", "ni") Expecting nothing ok Trying: add("c", "http://example.com/bar", "bar", "nini") Expecting nothing ok Trying: add("b", "http://example.com/", "first", "blah") Expecting nothing ok Trying: add("b", "http://example.com/", "second", "spam") Expecting nothing ok Trying: add("a", "http://example.com", "1", "a") Expecting nothing ok Trying: add("Some Realm", "http://c.example.com:3128", "3", "c") Expecting nothing ok Trying: add("Some Realm", "d.example.com", "4", "d") Expecting nothing ok Trying: add("Some Realm", "e.example.com:3128", "5", "e") Expecting nothing ok Trying: mgr.find_user_password("Some Realm", "example.com") Expecting: ('joe', 'password') ok Trying: mgr.find_user_password("Some Realm", "http://example.com") Expecting: ('joe', 'password') ok Trying: mgr.find_user_password("Some Realm", "http://example.com/") Expecting: ('joe', 'password') ok Trying: mgr.find_user_password("Some Realm", "http://example.com/spam") Expecting: ('joe', 'password') ok Trying: mgr.find_user_password("Some Realm", "http://example.com/spam/spam") Expecting: ('joe', 'password') ok Trying: mgr.find_user_password("c", "http://example.com/foo") Expecting: ('foo', 'ni') ok Trying: mgr.find_user_password("c", "http://example.com/bar") Expecting: ('bar', 'nini') ok Trying: mgr.find_user_password("b", "http://example.com/") Expecting: ('second', 'spam') ok Trying: mgr.find_user_password("a", "http://example.com/") Expecting: ('1', 'a') ok Trying: mgr.find_user_password("a", "http://a.example.com/") Expecting: (None, None) ok Trying: mgr.find_user_password("Some Realm", "c.example.com") Expecting: (None, None) ok Trying: mgr.find_user_password("Some Realm", "c.example.com:3128") Expecting: ('3', 'c') ok Trying: mgr.find_user_password("Some Realm", "http://c.example.com:3128") Expecting: ('3', 'c') ok Trying: mgr.find_user_password("Some Realm", "d.example.com") Expecting: ('4', 'd') ok Trying: mgr.find_user_password("Some Realm", "e.example.com:3128") Expecting: ('5', 'e') ok Trying: mgr = urllib2.HTTPPasswordMgr() Expecting nothing ok Trying: add = mgr.add_password Expecting nothing ok Trying: add("f", "http://g.example.com:80", "10", "j") Expecting nothing ok Trying: add("g", "http://h.example.com", "11", "k") Expecting nothing ok Trying: add("h", "i.example.com:80", "12", "l") Expecting nothing ok Trying: add("i", "j.example.com", "13", "m") Expecting nothing ok Trying: mgr.find_user_password("f", "g.example.com:100") Expecting: (None, None) ok Trying: mgr.find_user_password("f", "g.example.com:80") Expecting: ('10', 'j') ok Trying: mgr.find_user_password("f", "g.example.com") Expecting: (None, None) ok Trying: mgr.find_user_password("f", "http://g.example.com:100") Expecting: (None, None) ok Trying: mgr.find_user_password("f", "http://g.example.com:80") Expecting: ('10', 'j') ok Trying: mgr.find_user_password("f", "http://g.example.com") Expecting: ('10', 'j') ok Trying: mgr.find_user_password("g", "h.example.com") Expecting: ('11', 'k') ok Trying: mgr.find_user_password("g", "h.example.com:80") Expecting: ('11', 'k') ok Trying: mgr.find_user_password("g", "http://h.example.com:80") Expecting: ('11', 'k') ok Trying: mgr.find_user_password("h", "i.example.com") Expecting: (None, None) ok Trying: mgr.find_user_password("h", "i.example.com:80") Expecting: ('12', 'l') ok Trying: mgr.find_user_password("h", "http://i.example.com:80") Expecting: ('12', 'l') ok Trying: mgr.find_user_password("i", "j.example.com") Expecting: ('13', 'm') ok Trying: mgr.find_user_password("i", "j.example.com:80") Expecting: (None, None) ok Trying: mgr.find_user_password("i", "http://j.example.com") Expecting: ('13', 'm') ok Trying: mgr.find_user_password("i", "http://j.example.com:80") Expecting: (None, None) ok Trying: url = "http://example.com" Expecting nothing ok Trying: Request(url, headers={"Spam-eggs": "blah"}).headers["Spam-eggs"] Expecting: 'blah' ok Trying: Request(url, headers={"spam-EggS": "blah"}).headers["Spam-eggs"] Expecting: 'blah' ok Trying: url = "http://example.com" Expecting nothing ok Trying: r = Request(url, headers={"Spam-eggs": "blah"}) Expecting nothing ok Trying: r.has_header("Spam-eggs") Expecting: True ok Trying: r.header_items() Expecting: [('Spam-eggs', 'blah')] ok Trying: r.add_header("Foo-Bar", "baz") Expecting nothing ok Trying: items = r.header_items() Expecting nothing ok Trying: items.sort() Expecting nothing ok Trying: items Expecting: [('Foo-bar', 'baz'), ('Spam-eggs', 'blah')] ok Trying: r.has_header("Not-there") Expecting: False ok Trying: print r.get_header("Not-there") Expecting: None ok Trying: r.get_header("Not-there", "default") Expecting: 'default' ok 93 items had no tests: test.test_urllib2 test.test_urllib2.FakeMethod test.test_urllib2.FakeMethod.__call__ test.test_urllib2.FakeMethod.__init__ test.test_urllib2.HandlerTests test.test_urllib2.HandlerTests._test_basic_auth test.test_urllib2.HandlerTests.test_basic_and_digest_auth_handlers test.test_urllib2.HandlerTests.test_basic_auth test.test_urllib2.HandlerTests.test_basic_auth_with_single_quoted_realm test.test_urllib2.HandlerTests.test_cookie_redirect test.test_urllib2.HandlerTests.test_cookies test.test_urllib2.HandlerTests.test_errors test.test_urllib2.HandlerTests.test_file test.test_urllib2.HandlerTests.test_ftp test.test_urllib2.HandlerTests.test_http test.test_urllib2.HandlerTests.test_http_doubleslash test.test_urllib2.HandlerTests.test_proxy test.test_urllib2.HandlerTests.test_proxy_basic_auth test.test_urllib2.HandlerTests.test_proxy_https test.test_urllib2.HandlerTests.test_proxy_https_proxy_authorization test.test_urllib2.HandlerTests.test_proxy_no_proxy test.test_urllib2.HandlerTests.test_redirect test.test_urllib2.MiscTests test.test_urllib2.MiscTests.opener_has_handler test.test_urllib2.MiscTests.test_build_opener test.test_urllib2.MockCookieJar test.test_urllib2.MockCookieJar.add_cookie_header test.test_urllib2.MockCookieJar.extract_cookies test.test_urllib2.MockFile test.test_urllib2.MockFile.close test.test_urllib2.MockFile.read test.test_urllib2.MockFile.readline test.test_urllib2.MockHTTPClass test.test_urllib2.MockHTTPClass.__call__ test.test_urllib2.MockHTTPClass.__init__ test.test_urllib2.MockHTTPClass.getresponse test.test_urllib2.MockHTTPClass.request test.test_urllib2.MockHTTPClass.set_debuglevel test.test_urllib2.MockHTTPClass.set_tunnel test.test_urllib2.MockHTTPHandler test.test_urllib2.MockHTTPHandler.__init__ test.test_urllib2.MockHTTPHandler.http_open test.test_urllib2.MockHTTPHandler.reset test.test_urllib2.MockHTTPResponse test.test_urllib2.MockHTTPResponse.__init__ test.test_urllib2.MockHTTPResponse.read test.test_urllib2.MockHTTPSHandler test.test_urllib2.MockHTTPSHandler.__init__ test.test_urllib2.MockHTTPSHandler.https_open test.test_urllib2.MockHandler test.test_urllib2.MockHandler.__init__ test.test_urllib2.MockHandler.__lt__ test.test_urllib2.MockHandler._define_methods test.test_urllib2.MockHandler.add_parent test.test_urllib2.MockHandler.close test.test_urllib2.MockHandler.handle test.test_urllib2.MockHeaders test.test_urllib2.MockHeaders.getheaders test.test_urllib2.MockOpener test.test_urllib2.MockOpener.error test.test_urllib2.MockOpener.open test.test_urllib2.MockPasswordManager test.test_urllib2.MockPasswordManager.add_password test.test_urllib2.MockPasswordManager.find_user_password test.test_urllib2.MockResponse test.test_urllib2.MockResponse.__init__ test.test_urllib2.MockResponse.geturl test.test_urllib2.MockResponse.info test.test_urllib2.OpenerDirectorTests test.test_urllib2.OpenerDirectorTests.test_add_non_handler test.test_urllib2.OpenerDirectorTests.test_badly_named_methods test.test_urllib2.OpenerDirectorTests.test_handled test.test_urllib2.OpenerDirectorTests.test_handler_order test.test_urllib2.OpenerDirectorTests.test_http_error test.test_urllib2.OpenerDirectorTests.test_processors test.test_urllib2.OpenerDirectorTests.test_raise test.test_urllib2.RequestTests test.test_urllib2.RequestTests.setUp test.test_urllib2.RequestTests.test_add_data test.test_urllib2.RequestTests.test_get_full_url test.test_urllib2.RequestTests.test_get_host test.test_urllib2.RequestTests.test_get_host_unquote test.test_urllib2.RequestTests.test_get_type test.test_urllib2.RequestTests.test_method test.test_urllib2.RequestTests.test_proxy test.test_urllib2.RequestTests.test_selector test.test_urllib2.TrivialTests test.test_urllib2.TrivialTests.test_parse_http_list test.test_urllib2.TrivialTests.test_trivial test.test_urllib2.add_ordered_mock_handlers test.test_urllib2.build_test_opener test.test_urllib2.sanepathname2url test.test_urllib2.test_main 4 items passed all tests: 27 tests in test.test_urllib2.test_password_manager 22 tests in test.test_urllib2.test_password_manager_default_port 3 tests in test.test_urllib2.test_request_headers_dict 11 tests in test.test_urllib2.test_request_headers_methods 63 tests in 97 items. 63 passed and 0 failed. Test passed. doctest (test.test_urllib2) ... 63 tests with zero failures Trying: _parse_proxy('file:/ftp.example.com/') Expecting: Traceback (most recent call last): ValueError: proxy URL with no authority: 'file:/ftp.example.com/' ok Trying: _parse_proxy('proxy.example.com') Expecting: (None, None, None, 'proxy.example.com') ok Trying: _parse_proxy('proxy.example.com:3128') Expecting: (None, None, None, 'proxy.example.com:3128') ok Trying: _parse_proxy('joe:password@proxy.example.com') Expecting: (None, 'joe', 'password', 'proxy.example.com') ok Trying: _parse_proxy('joe:password@proxy.example.com:3128') Expecting: (None, 'joe', 'password', 'proxy.example.com:3128') ok Trying: _parse_proxy('http://proxy.example.com/') Expecting: ('http', None, None, 'proxy.example.com') ok Trying: _parse_proxy('http://proxy.example.com:3128/') Expecting: ('http', None, None, 'proxy.example.com:3128') ok Trying: _parse_proxy('http://joe:password@proxy.example.com/') Expecting: ('http', 'joe', 'password', 'proxy.example.com') ok Trying: _parse_proxy('http://joe:password@proxy.example.com:3128') Expecting: ('http', 'joe', 'password', 'proxy.example.com:3128') ok Trying: _parse_proxy('ftp://joe:password@proxy.example.com/rubbish:3128') Expecting: ('ftp', 'joe', 'password', 'proxy.example.com') ok Trying: _parse_proxy('http://joe:password@proxy.example.com') Expecting: ('http', 'joe', 'password', 'proxy.example.com') ok 113 items had no tests: urllib2 urllib2.AbstractBasicAuthHandler urllib2.AbstractBasicAuthHandler.__init__ urllib2.AbstractBasicAuthHandler.http_error_auth_reqed urllib2.AbstractBasicAuthHandler.retry_http_basic_auth urllib2.AbstractDigestAuthHandler urllib2.AbstractDigestAuthHandler.__init__ urllib2.AbstractDigestAuthHandler.get_algorithm_impls urllib2.AbstractDigestAuthHandler.get_authorization urllib2.AbstractDigestAuthHandler.get_cnonce urllib2.AbstractDigestAuthHandler.get_entity_digest urllib2.AbstractDigestAuthHandler.http_error_auth_reqed urllib2.AbstractDigestAuthHandler.reset_retry_count urllib2.AbstractDigestAuthHandler.retry_http_digest_auth urllib2.AbstractHTTPHandler urllib2.AbstractHTTPHandler.__init__ urllib2.AbstractHTTPHandler.do_open urllib2.AbstractHTTPHandler.do_request_ urllib2.AbstractHTTPHandler.set_http_debuglevel urllib2.BaseHandler urllib2.BaseHandler.__lt__ urllib2.BaseHandler.add_parent urllib2.BaseHandler.close urllib2.CacheFTPHandler urllib2.CacheFTPHandler.__init__ urllib2.CacheFTPHandler.check_cache urllib2.CacheFTPHandler.connect_ftp urllib2.CacheFTPHandler.setMaxConns urllib2.CacheFTPHandler.setTimeout urllib2.FTPHandler urllib2.FTPHandler.connect_ftp urllib2.FTPHandler.ftp_open urllib2.FileHandler urllib2.FileHandler.file_open urllib2.FileHandler.get_names urllib2.FileHandler.open_local_file urllib2.HTTPBasicAuthHandler urllib2.HTTPBasicAuthHandler.http_error_401 urllib2.HTTPCookieProcessor urllib2.HTTPCookieProcessor.__init__ urllib2.HTTPCookieProcessor.http_request urllib2.HTTPCookieProcessor.https_response urllib2.HTTPDefaultErrorHandler urllib2.HTTPDefaultErrorHandler.http_error_default urllib2.HTTPDigestAuthHandler urllib2.HTTPDigestAuthHandler.http_error_401 urllib2.HTTPError urllib2.HTTPError.__init__ urllib2.HTTPError.__str__ urllib2.HTTPErrorProcessor urllib2.HTTPErrorProcessor.https_response urllib2.HTTPHandler urllib2.HTTPHandler.http_open urllib2.HTTPPasswordMgr urllib2.HTTPPasswordMgr.__init__ urllib2.HTTPPasswordMgr.add_password urllib2.HTTPPasswordMgr.find_user_password urllib2.HTTPPasswordMgr.is_suburi urllib2.HTTPPasswordMgr.reduce_uri urllib2.HTTPPasswordMgrWithDefaultRealm urllib2.HTTPPasswordMgrWithDefaultRealm.find_user_password urllib2.HTTPRedirectHandler urllib2.HTTPRedirectHandler.http_error_307 urllib2.HTTPRedirectHandler.redirect_request urllib2.HTTPSHandler urllib2.HTTPSHandler.https_open urllib2.OpenerDirector urllib2.OpenerDirector.__init__ urllib2.OpenerDirector._call_chain urllib2.OpenerDirector._open urllib2.OpenerDirector.add_handler urllib2.OpenerDirector.close urllib2.OpenerDirector.error urllib2.OpenerDirector.open urllib2.ProxyBasicAuthHandler urllib2.ProxyBasicAuthHandler.http_error_407 urllib2.ProxyDigestAuthHandler urllib2.ProxyDigestAuthHandler.http_error_407 urllib2.ProxyHandler urllib2.ProxyHandler.__init__ urllib2.ProxyHandler.proxy_open urllib2.Request urllib2.Request.__getattr__ urllib2.Request.__init__ urllib2.Request.add_data urllib2.Request.add_header urllib2.Request.add_unredirected_header urllib2.Request.get_data urllib2.Request.get_full_url urllib2.Request.get_header urllib2.Request.get_host urllib2.Request.get_method urllib2.Request.get_origin_req_host urllib2.Request.get_selector urllib2.Request.get_type urllib2.Request.has_data urllib2.Request.has_header urllib2.Request.has_proxy urllib2.Request.header_items urllib2.Request.is_unverifiable urllib2.Request.set_proxy urllib2.URLError urllib2.URLError.__init__ urllib2.URLError.__str__ urllib2.UnknownHandler urllib2.UnknownHandler.unknown_open urllib2.build_opener urllib2.install_opener urllib2.parse_http_list urllib2.parse_keqv_list urllib2.randombytes urllib2.request_host urllib2.urlopen 1 items passed all tests: 11 tests in urllib2._parse_proxy 11 tests in 114 items. 11 passed and 0 failed. Test passed. doctest (urllib2) ... 11 tests with zero failures test_parse_http_list (test.test_urllib2.TrivialTests) ... ok test_trivial (test.test_urllib2.TrivialTests) ... ok test_add_non_handler (test.test_urllib2.OpenerDirectorTests) ... ok test_badly_named_methods (test.test_urllib2.OpenerDirectorTests) ... ok test_handled (test.test_urllib2.OpenerDirectorTests) ... ok test_handler_order (test.test_urllib2.OpenerDirectorTests) ... ok test_http_error (test.test_urllib2.OpenerDirectorTests) ... ok test_processors (test.test_urllib2.OpenerDirectorTests) ... ok test_raise (test.test_urllib2.OpenerDirectorTests) ... ok test_basic_and_digest_auth_handlers (test.test_urllib2.HandlerTests) ... ok test_basic_auth (test.test_urllib2.HandlerTests) ... ok test_basic_auth_with_single_quoted_realm (test.test_urllib2.HandlerTests) ... ok test_cookie_redirect (test.test_urllib2.HandlerTests) ... ok test_cookies (test.test_urllib2.HandlerTests) ... ok test_errors (test.test_urllib2.HandlerTests) ... ok test_file (test.test_urllib2.HandlerTests) ... ERROR test_ftp (test.test_urllib2.HandlerTests) ... ok test_http (test.test_urllib2.HandlerTests) ... ok test_http_doubleslash (test.test_urllib2.HandlerTests) ... ok test_proxy (test.test_urllib2.HandlerTests) ... ok test_proxy_basic_auth (test.test_urllib2.HandlerTests) ... ok test_proxy_https (test.test_urllib2.HandlerTests) ... ok test_proxy_https_proxy_authorization (test.test_urllib2.HandlerTests) ... ok test_proxy_no_proxy (test.test_urllib2.HandlerTests) ... ok test_redirect (test.test_urllib2.HandlerTests) ... ok test_build_opener (test.test_urllib2.MiscTests) ... ok test_add_data (test.test_urllib2.RequestTests) ... ok test_get_full_url (test.test_urllib2.RequestTests) ... ok test_get_host (test.test_urllib2.RequestTests) ... ok test_get_host_unquote (test.test_urllib2.RequestTests) ... ok test_get_type (test.test_urllib2.RequestTests) ... ok test_method (test.test_urllib2.RequestTests) ... ok test_proxy (test.test_urllib2.RequestTests) ... ok test_selector (test.test_urllib2.RequestTests) ... ok ====================================================================== ERROR: test_file (test.test_urllib2.HandlerTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "/tmp/python-test/local/lib/python2.7/test/test_urllib2.py", line 711, in test_file h.file_open, Request(url)) File "/tmp/python-test/local/lib/python2.7/unittest/case.py", line 456, in assertRaises callableObj(*args, **kwargs) File "/tmp/python-test/local/lib/python2.7/urllib2.py", line 1269, in file_open return self.open_local_file(req) File "/tmp/python-test/local/lib/python2.7/urllib2.py", line 1301, in open_local_file (not port and socket.gethostbyname(host) in self.get_names()): gaierror: [Errno -2] Name or service not known ---------------------------------------------------------------------- Ran 34 tests in 20.075s FAILED (errors=1) test test_urllib2 failed -- Traceback (most recent call last): File "/tmp/python-test/local/lib/python2.7/test/test_urllib2.py", line 711, in test_file h.file_open, Request(url)) File "/tmp/python-test/local/lib/python2.7/unittest/case.py", line 456, in assertRaises callableObj(*args, **kwargs) File "/tmp/python-test/local/lib/python2.7/urllib2.py", line 1269, in file_open return self.open_local_file(req) File "/tmp/python-test/local/lib/python2.7/urllib2.py", line 1301, in open_local_file (not port and socket.gethostbyname(host) in self.get_names()): gaierror: [Errno -2] Name or service not known test_urllib2_localnet test_urllib2net test_urllib2net skipped -- Use of the `network' resource not enabled test_urllibnet test_urllibnet skipped -- Use of the `network' resource not enabled test_urlparse test_userdict test_userlist test_userstring test_uu test_uuid test_wait3 test_wait4 test_warnings [15679 refs] [15679 refs] [15672 refs] [15679 refs] [15679 refs] [15672 refs] test_wave test_weakref test_weakset test_whichdb test_winreg test_winreg skipped -- No module named _winreg test_winsound test_winsound skipped -- No module named winsound test_with test_wsgiref test_xdrlib test_xml_etree test_xml_etree_c test_xmllib test_xmlrpc test_xpickle test_xpickle -- skipping backwards compat tests. Use 'regrtest.py -u xpickle' to run them. test_xrange test_zipfile test_zipfile64 test_zipfile64 skipped -- test requires loads of disk-space bytes and a long time to run test_zipimport test_zipimport_support test_zlib 346 tests OK. 1 test failed: test_urllib2 37 tests skipped: test_aepack test_al test_applesingle test_bsddb185 test_bsddb3 test_cd test_cl test_curses test_epoll test_gdb test_gl test_imgfile test_ioctl test_kqueue test_linuxaudiodev test_macos test_macostools test_multiprocessing test_ossaudiodev test_pep277 test_py3kwarn test_scriptpackages test_smtpnet test_socketserver test_startfile test_sunaudiodev test_tcl test_timeout test_tk test_ttk_guionly test_ttk_textonly test_unicode_file test_urllib2net test_urllibnet test_winreg test_winsound test_zipfile64 7 skips unexpected on linux2: test_epoll test_gdb test_ioctl test_multiprocessing test_tk test_ttk_guionly test_ttk_textonly [965791 refs]

1 0

r86871 - python/branches/pep-382/Lib/test/test_pep382.py
by martin.v.loewis Nov. 29, 2010

Nov. 29, 2010

Author: martin.v.loewis Date: Mon Nov 29 22:36:13 2010 New Revision: 86871 Log: Move cleanup into finally block. Modified: python/branches/pep-382/Lib/test/test_pep382.py Modified: python/branches/pep-382/Lib/test/test_pep382.py ============================================================================== --- python/branches/pep-382/Lib/test/test_pep382.py (original) +++ python/branches/pep-382/Lib/test/test_pep382.py Mon Nov 29 22:36:13 2010 @@ -19,11 +19,12 @@ original_value = sys.path_importer_cache.copy() original_object = sys.path_importer_cache - yield - - sys.path_importer_cache = original_object - sys.path_importer_cache.clear() - sys.path_importer_cache.update(original_value) + try: + yield + finally: + sys.path_importer_cache = original_object + sys.path_importer_cache.clear() + sys.path_importer_cache.update(original_value) @contextlib.contextmanager @@ -38,12 +39,12 @@ for key in matching_modules(): assert False, '{} already in sys.modules'.format(key) - yield - - # delete all matching modules - for key in matching_modules(): - del sys.modules[key] - + try: + yield + finally: + # delete all matching modules + for key in matching_modules(): + del sys.modules[key] class PthTestsBase(unittest.TestCase): """Try various combinations of __init__ and .pth files.

1 0

r86870 - in python/branches/py3k/Lib: bdb.py pdb.py
by georg.brandl Nov. 29, 2010

Nov. 29, 2010

Author: georg.brandl Date: Mon Nov 29 21:19:15 2010 New Revision: 86870 Log: Use booleans where applicable. Modified: python/branches/py3k/Lib/bdb.py python/branches/py3k/Lib/pdb.py Modified: python/branches/py3k/Lib/bdb.py ============================================================================== --- python/branches/py3k/Lib/bdb.py (original) +++ python/branches/py3k/Lib/bdb.py Mon Nov 29 21:19:15 2010 @@ -168,7 +168,7 @@ def _set_stopinfo(self, stopframe, returnframe, stoplineno=0): self.stopframe = stopframe self.returnframe = returnframe - self.quitting = 0 + self.quitting = False # stoplineno >= 0 means: stop at line >= the stoplineno # stoplineno -1 means: don't stop at all self.stoplineno = stoplineno @@ -225,7 +225,7 @@ def set_quit(self): self.stopframe = self.botframe self.returnframe = None - self.quitting = 1 + self.quitting = True sys.settrace(None) # Derived classes and clients can call the following methods @@ -235,7 +235,7 @@ # Call self.get_*break*() to see the breakpoints or better # for bp in Breakpoint.bpbynumber: if bp: bp.bpprint(). - def set_break(self, filename, lineno, temporary=0, cond = None, + def set_break(self, filename, lineno, temporary=False, cond=None, funcname=None): filename = self.canonic(filename) import linecache # Import as late as possible @@ -391,7 +391,7 @@ except BdbQuit: pass finally: - self.quitting = 1 + self.quitting = True sys.settrace(None) def runeval(self, expr, globals=None, locals=None): @@ -407,7 +407,7 @@ except BdbQuit: pass finally: - self.quitting = 1 + self.quitting = True sys.settrace(None) def runctx(self, cmd, globals, locals): @@ -425,7 +425,7 @@ except BdbQuit: pass finally: - self.quitting = 1 + self.quitting = True sys.settrace(None) return res @@ -457,7 +457,7 @@ # index 0 is unused, except for marking an # effective break .... see effective() - def __init__(self, file, line, temporary=0, cond=None, funcname=None): + def __init__(self, file, line, temporary=False, cond=None, funcname=None): self.funcname = funcname # Needed if funcname is not None. self.func_first_executable_line = None @@ -465,11 +465,11 @@ self.line = line self.temporary = temporary self.cond = cond - self.enabled = 1 + self.enabled = True self.ignore = 0 self.hits = 0 self.number = Breakpoint.next - Breakpoint.next = Breakpoint.next + 1 + Breakpoint.next += 1 # Build the two lists self.bpbynumber.append(self) if (file, line) in self.bplist: @@ -486,10 +486,10 @@ del self.bplist[index] def enable(self): - self.enabled = 1 + self.enabled = True def disable(self): - self.enabled = 0 + self.enabled = False def bpprint(self, out=None): if out is None: Modified: python/branches/py3k/Lib/pdb.py ============================================================================== --- python/branches/py3k/Lib/pdb.py (original) +++ python/branches/py3k/Lib/pdb.py Mon Nov 29 21:19:15 2010 @@ -94,14 +94,14 @@ # consumer of this info expects the first line to be 1 lineno = 1 answer = None - while 1: + while True: line = fp.readline() if line == '': break if cre.match(line): answer = funcname, filename, lineno break - lineno = lineno + 1 + lineno += 1 fp.close() return answer @@ -140,7 +140,7 @@ self.prompt = '(Pdb) ' self.aliases = {} self.mainpyfile = '' - self._wait_for_mainpyfile = 0 + self._wait_for_mainpyfile = False self.tb_lineno = {} # Try to load readline if it exists try: @@ -235,9 +235,9 @@ """This function is called when we stop or break at this line.""" if self._wait_for_mainpyfile: if (self.mainpyfile != self.canonic(frame.f_code.co_filename) - or frame.f_lineno<= 0): + or frame.f_lineno <= 0): return - self._wait_for_mainpyfile = 0 + self._wait_for_mainpyfile = False if self.bp_commands(frame): self.interaction(frame, None) @@ -337,7 +337,7 @@ for tmpArg in args[1:]: line = line.replace("%" + str(ii), tmpArg) - ii = ii + 1 + ii += 1 line = line.replace("%*", ' '.join(args[1:])) args = line.split() # split into ';;' separated commands @@ -962,7 +962,7 @@ """q(uit)\nexit Quit from the debugger. The program being executed is aborted. """ - self._user_requested_quit = 1 + self._user_requested_quit = True self.set_quit() return 1 @@ -974,7 +974,7 @@ Handles the receipt of EOF as a command. """ self.message('') - self._user_requested_quit = 1 + self._user_requested_quit = True self.set_quit() return 1 @@ -1326,9 +1326,9 @@ # events depends on python version). So we take special measures to # avoid stopping before we reach the main script (see user_line and # user_call for details). - self._wait_for_mainpyfile = 1 + self._wait_for_mainpyfile = True self.mainpyfile = self.canonic(filename) - self._user_requested_quit = 0 + self._user_requested_quit = False with open(filename, "rb") as fp: statement = "exec(compile(%r, %r, 'exec'))" % \ (fp.read(), self.mainpyfile)

1 0