cpython/Lib/test
Brian Curtin 918616ce91 Merged revisions 85299 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85299 | brian.curtin | 2010-10-06 20:12:19 -0500 (Wed, 06 Oct 2010) | 9 lines

  Fix #8584. Fix the skipping of a number of tests due to incorrect importing.

  This undoes a previous attempt to fix some of the skips. Value and copy
  come from sharedctypes rather than plain ctypes, and the test skipping is
  then done at the class level rather than test-by-test.

  There are zero skipped tests after the fix.
........
2010-10-07 02:12:17 +00:00
..
crashers Merged revisions 77523 via svnmerge from 2010-01-16 15:11:38 +00:00
decimaltestdata Merged revisions 82646,82649-82650 via svnmerge from 2010-07-08 19:21:59 +00:00
leakers Raise statement normalization in Lib/test/. 2007-08-29 23:37:32 +00:00
sndhdrdata Merged revisions 82856-82857 via svnmerge from 2010-07-13 23:19:20 +00:00
tracedmodules Merged revisions 84994 via svnmerge from 2010-09-24 18:08:24 +00:00
185test.db
__init__.py
audiotest.au Merged revisions 80795 via svnmerge from 2010-05-21 13:11:00 +00:00
autotest.py
bad_coding.py
bad_coding2.py Rip out all the u"..." literals and calls to unicode(). 2007-05-02 19:09:54 +00:00
badcert.pem Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from 2007-09-19 03:06:30 +00:00
badkey.pem Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from 2007-09-19 03:06:30 +00:00
badsyntax_3131.py Implement PEP 3131. Add isidentifier to str. 2007-08-15 07:32:56 +00:00
badsyntax_future3.py
badsyntax_future4.py
badsyntax_future5.py
badsyntax_future6.py
badsyntax_future7.py
badsyntax_future8.py Fix most trivially-findable print statements. 2007-02-09 05:37:30 +00:00
badsyntax_future9.py Fix most trivially-findable print statements. 2007-02-09 05:37:30 +00:00
badsyntax_nocaret.py
badsyntax_pep3120.py Implement PEP 3120. 2007-07-29 18:10:01 +00:00
buffer_tests.py make 'c' only accept bytes and 'C' only unicode #5499 2009-04-02 00:33:55 +00:00
cfgparser.1
check_soundcard.vbs
cjkencodings_test.py Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617-60678 via svnmerge from 2008-02-09 02:18:51 +00:00
cmath_testcases.txt Merged revisions 73451 via svnmerge from 2009-06-16 20:54:33 +00:00
curses_tests.py Merged revisions 60094-60123 via svnmerge from 2008-01-20 09:06:41 +00:00
dis_module.py Merged revisions 55631-55794 via svnmerge from 2007-06-06 23:52:48 +00:00
doctest_aliases.py Fix a bunch of doctests with the -d option of refactor.py. 2007-02-09 20:13:25 +00:00
double_const.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
empty.vbs
exception_hierarchy.txt Merged revisions 59275-59303 via svnmerge from 2007-12-03 21:02:03 +00:00
floating_points.txt Merged revisions 77452 via svnmerge from 2010-01-12 23:09:26 +00:00
fork_wait.py Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875. 2008-05-25 13:05:15 +00:00
formatfloat_testcases.txt Issue #5859: Remove '%f' to '%g' formatting switch for large floats. 2009-05-01 15:37:04 +00:00
https_svn_python_org_root.pem Merged revisions 77405 via svnmerge from 2010-01-10 10:33:12 +00:00
ieee754.txt Quick fix for test_math failures on Solaris 10 buildbot. For future 2008-06-18 10:04:31 +00:00
inspect_fodder.py Merged revisions 55328-55341 via svnmerge from 2007-05-15 18:46:22 +00:00
inspect_fodder2.py fix inspect.formatargspec on functions with keyword-only arguments without defaults #4959 2009-01-17 04:15:01 +00:00
keycert.pem Merge the trunk changes in. Breaks socket.ssl for now. 2007-08-28 21:37:11 +00:00
list_tests.py Merged revisions 81226 via svnmerge from 2010-05-16 00:37:36 +00:00
lock_tests.py Merged revisions 76138,76173 via svnmerge from 2009-11-09 16:52:46 +00:00
mapping_tests.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
nullcert.pem Merged revisions 58095-58132,58136-58148,58151-58197 via svnmerge from 2007-09-19 03:06:30 +00:00
outstanding_bugs.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
pickletester.py Merged revisions 82937 via svnmerge from 2010-07-17 23:01:39 +00:00
profilee.py Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from 2008-02-06 14:31:34 +00:00
pyclbr_input.py
pydoc_mod.py Merged revisions 63724,63726,63732,63744,63754-63755,63757-63758,63760,63775,63781-63782,63787,63805-63808,63818-63819,63823-63824 via svnmerge from 2008-06-10 16:57:31 +00:00
pydocfodder.py Merged revisions 60176-60209 via svnmerge from 2008-01-23 08:24:23 +00:00
pystone.py Merged revisions 65012,65035,65037-65040,65048,65057,65077,65091-65095,65097-65099,65127-65128,65131,65133-65136,65139,65149-65151,65155,65158-65159,65176-65178,65183-65184,65187-65190,65192,65194 via svnmerge from 2008-07-23 16:10:53 +00:00
randv2_32.pck Merged revisions 59275-59303 via svnmerge from 2007-12-03 21:02:03 +00:00
randv2_64.pck Merged revisions 59275-59303 via svnmerge from 2007-12-03 21:02:03 +00:00
randv3.pck Merged revisions 59275-59303 via svnmerge from 2007-12-03 21:02:03 +00:00
re_tests.py #2834: Change re module semantics, so that str and bytes mixing is forbidden, 2008-08-19 17:56:33 +00:00
regex_tests.py Remove several mentions of old Python versions that don't apply anymore. 2008-01-05 20:00:55 +00:00
regrtest.py Merged revisions 81359-81361 via svnmerge from 2010-05-19 20:30:19 +00:00
relimport.py Another missing file after merge from trunk. 2008-03-20 01:10:45 +00:00
reperf.py Fix most trivially-findable print statements. 2007-02-09 05:37:30 +00:00
sample_doctest.py Fix a bunch of doctests with the -d option of refactor.py. 2007-02-09 20:13:25 +00:00
seq_tests.py Closes release blocker #3627. 2008-08-24 07:08:55 +00:00
sgml_input.html Four months of trunk changes (including a few releases...) 2006-12-13 04:49:30 +00:00
sha256.pem Merged revisions 80317 via svnmerge from 2010-04-21 19:52:52 +00:00
Sine-1000Hz-300ms.aif Merged revisions 72100-72101 via svnmerge from 2009-04-29 15:34:32 +00:00
sortperf.py Merged revisions 83371,83390 via svnmerge from 2010-08-01 19:07:28 +00:00
ssl_cert.pem Merged revisions 53952-54987 via svnmerge from 2007-04-27 19:54:29 +00:00
ssl_key.pem Merged revisions 53952-54987 via svnmerge from 2007-04-27 19:54:29 +00:00
string_tests.py Merged revisions 77731 via svnmerge from 2010-01-24 21:02:05 +00:00
support.py Recorded merge of revisions 83987 via svnmerge from 2010-09-10 12:32:58 +00:00
svn_python_org_https_cert.pem add the certificate for the Python SVN repository for testing SSL 2007-11-15 23:01:30 +00:00
test.xml
test.xml.out
test___all__.py Backporting since it would have helped us find a regression. 2009-10-27 13:08:37 +00:00
test___future__.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test__locale.py fix test__locale on windows #5643 2009-05-05 22:49:38 +00:00
test_abc.py Merged revisions 85154,85182 via svnmerge from 2010-10-02 18:04:55 +00:00
test_abstract_numbers.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_aifc.py Merged revisions 70768,71657,71721,71729,71794,71976,72036-72037,72079,72085,72131-72134,72191,72197-72198,72219,72221,72225,72303,72434,72467,72476 via svnmerge from 2009-05-08 20:42:26 +00:00
test_array.py Merged revisions 83030 via svnmerge from 2010-07-21 16:53:04 +00:00
test_ascii_formatd.py Issue #8531: Skip test_ascii_formatd if ctypes module is missing 2010-04-25 23:09:27 +00:00
test_ast.py remove support for byte literals; a new feature 2010-07-18 14:36:12 +00:00
test_asynchat.py Merged revisions 74126,74130-74131,74149,74155,74157,74180-74183,74398 via svnmerge from 2009-08-13 09:34:05 +00:00
test_asyncore.py Merged revisions 83201 via svnmerge from 2010-08-01 21:16:54 +00:00
test_atexit.py merge from trunk 2008-10-11 00:49:57 +00:00
test_audioop.py Merged revisions 82495 via svnmerge from 2010-07-03 13:46:01 +00:00
test_augassign.py Merged revisions 75224 via svnmerge from 2009-10-03 20:28:47 +00:00
test_base64.py Merged revisions 81535 via svnmerge from 2010-05-25 22:18:30 +00:00
test_bigaddrspace.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_bigmem.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_binascii.py Merged revisions 77508 via svnmerge from 2010-01-15 00:31:01 +00:00
test_binhex.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_binop.py Merged revisions 83212,83829,83833,83838-83839,83878,84019,84025,84028,84032,84036 via svnmerge from 2010-08-14 18:24:40 +00:00
test_bisect.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_bool.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_bufio.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_builtin.py Merged revisions 84655 via svnmerge from 2010-09-09 20:33:43 +00:00
test_bytes.py Merged revisions 80125,80128,80130 via svnmerge from 2010-04-16 23:19:11 +00:00
test_bz2.py Merged revisions 83440 via svnmerge from 2010-08-01 20:12:04 +00:00
test_calendar.py Merged revisions 69846 via svnmerge from 2009-02-21 20:59:32 +00:00
test_call.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_capi.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_cfgparser.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_cgi.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_charmapcodec.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_class.py remove some more references to __cmp__ #1717 2008-10-16 19:34:46 +00:00
test_cmath.py Merged revisions 76943 via svnmerge from 2009-12-20 19:57:24 +00:00
test_cmd.py Merged revisions 83380 via svnmerge from 2010-08-01 04:14:22 +00:00
test_cmd_line.py Merged revisions 80116 via svnmerge from 2010-04-16 15:44:04 +00:00
test_cmd_line_script.py Merged revisions 78500 via svnmerge from 2010-02-27 16:17:11 +00:00
test_code.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_codeccallbacks.py Merged revisions 84655 via svnmerge from 2010-09-09 20:33:43 +00:00
test_codecencodings_cn.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_codecencodings_hk.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_codecencodings_jp.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_codecencodings_kr.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_codecencodings_tw.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_codecmaps_cn.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_codecmaps_hk.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_codecmaps_jp.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_codecmaps_kr.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_codecmaps_tw.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_codecs.py Merged revisions 81908 via svnmerge from 2010-06-11 21:48:34 +00:00
test_codeop.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_coding.py Merged revisions 73623-73624 via svnmerge from 2009-06-28 17:35:48 +00:00
test_collections.py Issue #9826: Handle recursive repr in collections.OrderedDict. 2010-09-12 05:28:42 +00:00
test_colorsys.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_compare.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_compile.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_compileall.py Merged revisions 78991-78992,78994 via svnmerge from 2010-03-21 22:02:42 +00:00
test_complex.py Merged revisions 83400 via svnmerge from 2010-08-01 10:43:42 +00:00
test_contains.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_contextlib.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_copy.py Merged revisions 84495-84497 via svnmerge from 2010-09-04 17:49:13 +00:00
test_copyreg.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_cprofile.py Merged revisions 73064 via svnmerge from 2009-05-30 21:41:10 +00:00
test_crypt.py Merged revisions 70734,70775,70856,70874,70876-70877 via svnmerge 2009-03-31 23:16:50 +00:00
test_csv.py Merged revisions 75231 via svnmerge from 2009-10-04 14:54:52 +00:00
test_ctypes.py Merged revisions 70734,70775,70856,70874,70876-70877 via svnmerge 2009-03-31 23:16:50 +00:00
test_curses.py Merged revisions 83780 via svnmerge from 2010-08-07 13:05:49 +00:00
test_datetime.py Merged revisions 82578 via svnmerge from 2010-07-05 15:26:36 +00:00
test_dbm.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_dbm_dumb.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_dbm_gnu.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_dbm_ndbm.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_decimal.py Merged revisions 82646,82649-82650 via svnmerge from 2010-07-08 19:21:59 +00:00
test_decorators.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_defaultdict.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_deque.py Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) 2009-12-10 05:36:11 +00:00
test_descr.py Merged revisions 84984 via svnmerge from 2010-09-23 20:16:03 +00:00
test_descrtut.py Merged revisions 69846 via svnmerge from 2009-02-21 20:59:32 +00:00
test_dict.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_dictcomps.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_dictviews.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_difflib.py Merged revisions 76469 via svnmerge from 2009-11-23 19:06:11 +00:00
test_difflib_expect.html
test_dis.py Merged revisions 67818 via svnmerge from 2008-12-18 11:06:25 +00:00
test_distutils.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_doctest.py Merged revisions 83259,83261,83264-83265,83268-83269,83271-83272,83281 via svnmerge from 2010-08-01 19:35:16 +00:00
test_doctest.txt Kill off softspace completely (except in formatter.py which seems to have 2007-02-09 23:20:19 +00:00
test_doctest2.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_doctest2.txt
test_doctest3.txt Bug #2565: The repr() of type objects now calls them 'class', 2008-04-07 05:43:42 +00:00
test_doctest4.txt Fix test_doctest: drop u prefixes; explicitly declare 2007-07-20 07:13:39 +00:00
test_docxmlrpc.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_dummy_thread.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_dummy_threading.py Merged revisions 65824 via svnmerge from 2008-08-18 18:09:21 +00:00
test_email.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_enumerate.py Merged revisions 81528 via svnmerge from 2010-05-25 19:48:15 +00:00
test_eof.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_epoll.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_errno.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_exception_variations.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_exceptions.py Merged revisions 78766 via svnmerge from 2010-03-07 17:14:15 +00:00
test_extcall.py Merged revisions 73623-73624 via svnmerge from 2009-06-28 17:35:48 +00:00
test_fcntl.py Merged revisions 72887 via svnmerge from 2009-05-24 15:46:13 +00:00
test_file.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_filecmp.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_fileinput.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_fileio.py Merged revisions 84506 via svnmerge from 2010-09-04 21:02:41 +00:00
test_float.py Merged revisions 77452 via svnmerge from 2010-01-12 23:09:26 +00:00
test_flufl.py The BDFL has retired! Long live the FLUFL (Friendly Language Uncle For Life)! 2009-04-01 05:08:41 +00:00
test_fnmatch.py Merged revisions 77236,77383,77399,77857,78238,78861-78862,78958 via svnmerge from 2010-10-06 07:55:35 +00:00
test_fork1.py Merged revisions 75246 via svnmerge from 2009-10-04 20:35:30 +00:00
test_format.py The other half of Issue #1580: use short float repr where possible. 2009-04-16 20:16:10 +00:00
test_fractions.py Merged revisions 74078 via svnmerge from 2009-07-18 14:43:10 +00:00
test_frozen.py fix #4211: the __path__ of a frozen package should be a list. 2008-11-05 22:48:33 +00:00
test_ftplib.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_funcattrs.py Merged revisions 74609,74627,74634,74645,74651,74738,74840,75016,75316-75317,75323-75324,75326,75328,75330,75338,75340-75341,75343,75352-75353,75355,75357,75359 via svnmerge from 2009-10-27 20:19:02 +00:00
test_functools.py Merged revisions 84098 via svnmerge from 2010-08-16 19:46:32 +00:00
test_future.py Merged revisions 67066 via svnmerge from 2008-10-31 02:28:05 +00:00
test_future1.py
test_future2.py Remove functions in string module that are also string methods. Also remove: 2007-04-17 08:48:32 +00:00
test_future3.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_future4.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_future5.py Merged revisions 67030-67031 via svnmerge from 2008-10-26 20:58:53 +00:00
test_gc.py Merged revisions 70837,70864,70878,71004,71032,71043 via svnmerge from 2009-04-04 16:35:46 +00:00
test_generators.py Merged revisions 73196,73278-73280,73299,73308,73312-73313,73317-73318,73321,73324,73331,73335,73340,73363 via svnmerge from 2009-06-11 22:54:11 +00:00
test_genericpath.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_genexps.py Merged revisions 73196,73278-73280,73299,73308,73312-73313,73317-73318,73321,73324,73331,73335,73340,73363 via svnmerge from 2009-06-11 22:54:11 +00:00
test_getargs2.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_getopt.py Merged revisions 83116 via svnmerge from 2010-07-24 01:11:58 +00:00
test_gettext.py Merged revisions 85223 via svnmerge from 2010-10-04 23:57:46 +00:00
test_glob.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_global.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_grammar.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_grp.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_gzip.py Merged revisions 85291 via svnmerge from 2010-10-06 21:29:56 +00:00
test_hash.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_hashlib.py Merged revisions 77389 via svnmerge from 2010-01-09 18:48:46 +00:00
test_heapq.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_hmac.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_htmlparser.py Merged revisions 81504 via svnmerge from 2010-05-24 21:48:07 +00:00
test_http_cookiejar.py Merged revisions 82985 via svnmerge from 2010-07-25 19:53:20 +00:00
test_http_cookies.py Merged revisions 83393,83396,83398,83404-83405,83408 via svnmerge from 2010-08-01 18:56:30 +00:00
test_httplib.py Merged revisions 85209 via svnmerge from 2010-10-04 05:45:46 +00:00
test_httpservers.py Merged revisions 85202 via svnmerge from 2010-10-03 18:04:52 +00:00
test_imaplib.py Merged revisions 76730 via svnmerge from 2009-12-12 18:38:24 +00:00
test_imp.py Merged revisions 79144 via svnmerge from 2010-03-20 20:38:20 +00:00
test_import.py Merged revisions 81214,82302,82465,83090-83091,84097,84099 via svnmerge from 2010-08-16 22:40:45 +00:00
test_importhooks.py Merged revisions 76240 via svnmerge from 2009-11-13 16:31:51 +00:00
test_importlib.py Add initial implementation of importlib. See the NOTES files for what is 2009-01-18 00:24:28 +00:00
test_index.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_inspect.py Merged revisions 82045 via svnmerge from 2010-06-17 13:27:40 +00:00
test_int.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_int_literal.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_io.py Merged revisions 84814 via svnmerge from 2010-09-14 18:53:07 +00:00
test_ioctl.py Merged revisions 84589 via svnmerge from 2010-09-07 16:32:28 +00:00
test_isinstance.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_iter.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_iterlen.py Validate that __length_hint__ returns a usable result. 2009-02-03 02:12:10 +00:00
test_itertools.py Issue #7410: deepcopy of itertools.count was resetting the count. 2009-11-30 21:55:17 +00:00
test_json.py Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from 2008-05-25 18:19:30 +00:00
test_keywordonlyarg.py allow keyword args after *args in a function call 2008-08-19 20:57:10 +00:00
test_kqueue.py Merged revisions 74055 via svnmerge from 2009-08-13 12:26:19 +00:00
test_largefile.py Merged revisions 77895-77896 via svnmerge from 2010-01-31 23:20:26 +00:00
test_lib2to3.py Merged revisions 77103,77105-77106 via svnmerge from 2009-12-29 00:44:14 +00:00
test_linecache.py Merged revisions 81438 via svnmerge from 2010-05-21 21:49:24 +00:00
test_list.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_listcomps.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_locale.py Merged revisions 84973 via svnmerge from 2010-09-24 09:19:25 +00:00
test_logging.py Merged revisions 77389 via svnmerge from 2010-01-09 18:48:46 +00:00
test_long.py Merged revisions 81553 via svnmerge from 2010-05-26 19:18:28 +00:00
test_longexp.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_macpath.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_mailbox.py Merged revisions 76055 via svnmerge from 2009-11-02 11:40:19 +00:00
test_marshal.py Merged revisions 75145 via svnmerge from 2009-09-29 19:24:38 +00:00
test_math.py Merged revisions 81127 via svnmerge from 2010-05-12 19:57:07 +00:00
test_memoryio.py Merged revisions 77895-77896 via svnmerge from 2010-01-31 23:20:26 +00:00
test_memoryview.py Merged revisions 84408-84409 via svnmerge from 2010-09-01 21:16:10 +00:00
test_metaclass.py Merged revisions 78505-78506 via svnmerge from 2010-02-27 17:56:22 +00:00
test_mimetypes.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_minidom.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_mmap.py Merged revisions 83407 via svnmerge from 2010-08-01 15:44:11 +00:00
test_module.py Merged revisions 76235 via svnmerge from 2009-11-13 02:29:35 +00:00
test_modulefinder.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_multibytecodec.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_multibytecodec_support.py Merged revisions 76010 via svnmerge from 2009-11-01 16:04:09 +00:00
test_multiprocessing.py Merged revisions 85299 via svnmerge from 2010-10-07 02:12:17 +00:00
test_mutants.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_netrc.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_nis.py Merged revisions 84735 via svnmerge from 2010-09-12 13:58:34 +00:00
test_normalization.py Merged revisions 76036 via svnmerge from 2009-11-01 22:07:18 +00:00
test_ntpath.py Merged revisions 83352,83355-83358,83362,83366,83368-83369 via svnmerge from 2010-08-01 19:17:57 +00:00
test_opcodes.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_openpty.py Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from 2009-03-28 21:42:05 +00:00
test_operator.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_optparse.py Merged revisions 83352,83355-83358,83362,83366,83368-83369 via svnmerge from 2010-08-01 19:17:57 +00:00
test_os.py Merged revisions 80108,80111,80114-80115 via svnmerge from 2010-04-16 16:32:49 +00:00
test_ossaudiodev.py Merged revisions 80795 via svnmerge from 2010-05-21 13:11:00 +00:00
test_osx_env.py Merged revisions 83073 via svnmerge from 2010-07-23 11:51:28 +00:00
test_parser.py Merged revisions 82555 via svnmerge from 2010-07-04 18:39:48 +00:00
test_pdb.py Merged revisions 83259,83261,83264-83265,83268-83269,83271-83272,83281 via svnmerge from 2010-08-01 19:35:16 +00:00
test_peepholer.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_pep247.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_pep263.py Merged revisions 78608 via svnmerge from 2010-03-03 00:22:21 +00:00
test_pep277.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_pep292.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_pep352.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_pep3120.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_pep3131.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_pickle.py Port r71408 to py3k: issue 5665, add more pickling tests. 2009-04-16 03:18:06 +00:00
test_pickletools.py Issue #6137: The pickle module now translates module names when loading 2009-06-04 20:32:06 +00:00
test_pipes.py Merged revisions 81365,81367 via svnmerge from 2010-05-19 21:22:58 +00:00
test_pkg.py Merged revisions 76240 via svnmerge from 2009-11-13 16:31:51 +00:00
test_pkgimport.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_pkgutil.py Merged revisions 73833,73838,73850-73852,73856-73857 via svnmerge from 2009-08-13 09:04:31 +00:00
test_platform.py Merged revisions 83075 via svnmerge from 2010-07-23 12:36:59 +00:00
test_plistlib.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_poll.py Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from 2009-03-28 21:42:05 +00:00
test_popen.py Merged revisions 76723 via svnmerge from 2009-12-09 00:03:16 +00:00
test_poplib.py Merged revisions 80454 via svnmerge from 2010-04-24 21:30:20 +00:00
test_posix.py Merged revisions 84492 via svnmerge from 2010-09-04 17:33:06 +00:00
test_posixpath.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_pow.py Merged revisions 83212,83829,83833,83838-83839,83878,84019,84025,84028,84032,84036 via svnmerge from 2010-08-14 18:24:40 +00:00
test_pprint.py Merged revisions 77731 via svnmerge from 2010-01-24 21:02:05 +00:00
test_print.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_profile.py Merged revisions 73064 via svnmerge from 2009-05-30 21:41:10 +00:00
test_property.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_pstats.py Merged revisions 83531 via svnmerge from 2010-08-02 17:36:05 +00:00
test_pty.py Merged revisions 71785 via svnmerge from 2009-04-22 02:24:39 +00:00
test_pwd.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_pyclbr.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_pydoc.py Merged revisions 79520 via svnmerge from 2010-03-31 03:22:46 +00:00
test_pyexpat.py Merged revisions 77700 via svnmerge from 2010-01-22 17:52:26 +00:00
test_queue.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_quopri.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_raise.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_random.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_range.py Merged revisions 76292-76293 via svnmerge from 2009-11-15 10:17:48 +00:00
test_re.py Merged revisions 78729 via svnmerge from 2010-03-06 15:27:04 +00:00
test_reprlib.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_resource.py Merged revisions 70734,70775,70856,70874,70876-70877 via svnmerge 2009-03-31 23:16:50 +00:00
test_richcmp.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_rlcompleter.py Merged revisions 83719 via svnmerge from 2010-08-04 15:48:41 +00:00
test_robotparser.py Merged revisions 84597-84599 via svnmerge from 2010-09-07 21:22:56 +00:00
test_runpy.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_sax.py #2501 xml.sax.parser doesn't terminate when given a filename; enable some more tests! 2008-09-04 02:22:52 +00:00
test_scope.py Merged revisions 74126,74130-74131,74149,74155,74157,74180-74183,74398 via svnmerge from 2009-08-13 09:34:05 +00:00
test_select.py Merged revisions 79868 via svnmerge from 2010-04-06 21:59:20 +00:00
test_set.py Merged revisions 83385-83389,83391 via svnmerge from 2010-08-01 19:04:55 +00:00
test_setcomps.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_shelve.py Merged revisions 78145 via svnmerge from 2010-02-11 03:06:51 +00:00
test_shlex.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_shutil.py Merged revisions 80833 via svnmerge from 2010-05-05 22:39:31 +00:00
test_signal.py Merged revisions 85140 via svnmerge from 2010-10-01 15:09:53 +00:00
test_SimpleHTTPServer.py Create http package. #2883. 2008-05-26 16:32:26 +00:00
test_site.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_slice.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_smtplib.py Merged revisions 80671 via svnmerge from 2010-04-30 23:23:38 +00:00
test_smtpnet.py Merged revisions 72838-72839 via svnmerge from 2009-05-23 02:36:15 +00:00
test_sndhdr.py Add missing file from the previous commit (r82859): test_sndhdr.py 2010-07-13 23:31:11 +00:00
test_socket.py Merged revisions 85032 via svnmerge from 2010-09-27 18:14:43 +00:00
test_socketserver.py Merged revisions 81545 via svnmerge from 2010-05-26 17:35:09 +00:00
test_sort.py Issue #1717: Remove cmp. Stage 1: remove all uses of cmp and __cmp__ from 2009-01-27 18:17:45 +00:00
test_sqlite.py Merged revisions 70734,70775,70856,70874,70876-70877 via svnmerge 2009-03-31 23:16:50 +00:00
test_ssl.py Merged revisions 84807 via svnmerge from 2010-09-14 14:47:08 +00:00
test_startfile.py Merged revisions 70734,70775,70856,70874,70876-70877 via svnmerge 2009-03-31 23:16:50 +00:00
test_strftime.py Merged revisions 77236,77383,77399,77857,78238,78861-78862,78958 via svnmerge from 2010-10-06 07:55:35 +00:00
test_string.py Merged revisions 75074 via svnmerge from 2009-09-26 12:35:01 +00:00
test_stringprep.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_strlit.py Minimal change that disables (AFAICT) the interpolation of \u and \U inside 2007-11-12 01:13:56 +00:00
test_strptime.py Merged revisions 76875 via svnmerge from 2009-12-18 15:37:48 +00:00
test_strtod.py Merged revisions 78289 via svnmerge from 2010-02-21 14:51:02 +00:00
test_struct.py Merged revisions 82637 via svnmerge from 2010-07-07 22:50:58 +00:00
test_structmembers.py Merged revisions 78918,78920 via svnmerge from 2010-04-06 15:44:57 +00:00
test_structseq.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_subprocess.py Merged revisions 84909-84913 via svnmerge from 2010-09-20 11:17:39 +00:00
test_sunau.py Merged revisions 81809 via svnmerge from 2010-06-07 20:24:48 +00:00
test_sundry.py Merged revisions 83719 via svnmerge from 2010-08-04 15:48:41 +00:00
test_super.py Fix for bug 4360 "SystemError when method has both super() & closure". Patch 2008-11-20 20:01:57 +00:00
test_symtable.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_syntax.py The 3.1 compiler don't check for keyword assignments in all places. 2010-08-19 22:29:49 +00:00
test_sys.py Merged revisions 83212,83829,83833,83838-83839,83878,84019,84025,84028,84032,84036 via svnmerge from 2010-08-14 18:24:40 +00:00
test_sys_setprofile.py Merged revisions 83140-83141 via svnmerge from 2010-07-25 22:15:16 +00:00
test_sys_settrace.py Merged revisions 83140-83141 via svnmerge from 2010-07-25 22:15:16 +00:00
test_syslog.py Allow skipping of regression tests not supported on windows. This reduces noise in the regression test suite for py3k on Windows. 2009-04-01 11:28:47 +00:00
test_tarfile.py Merged revisions 81665 via svnmerge from 2010-06-03 10:15:18 +00:00
test_tcl.py Merged revisions 84876 via svnmerge from 2010-09-21 19:12:39 +00:00
test_telnetlib.py Merged revisions 74638,76133 via svnmerge from 2009-11-06 21:14:59 +00:00
test_tempfile.py Merged revisions 76593 via svnmerge from 2009-11-30 00:16:44 +00:00
test_textwrap.py Issue #4163: textwrap module: allow word splitting on a hyphen preceded by a non-ASCII letter. 2008-12-13 23:20:54 +00:00
test_thread.py Merged revisions 76138,76173 via svnmerge from 2009-11-09 16:52:46 +00:00
test_threaded_import.py Merged revisions 84258,84268 via svnmerge from 2010-08-22 20:46:30 +00:00
test_threadedtempfile.py fix small typo 2008-09-05 00:43:33 +00:00
test_threading.py Merged revisions 84909-84913 via svnmerge from 2010-09-20 11:17:39 +00:00
test_threading_local.py Merged revisions 84344 via svnmerge from 2010-08-28 18:27:09 +00:00
test_threadsignals.py Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from 2009-03-28 21:42:05 +00:00
test_time.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_timeout.py Merged revisions 78016 via svnmerge from 2010-02-06 05:09:09 +00:00
test_tk.py Remove redundant import of tkinter. 2009-04-01 16:39:21 +00:00
test_tokenize.py Merged revisions 84364 via svnmerge from 2010-08-30 14:44:53 +00:00
test_trace.py Merged revisions 85000 via svnmerge from 2010-09-24 22:14:13 +00:00
test_traceback.py Merged revisions 76573 via svnmerge from 2009-11-28 16:16:09 +00:00
test_ttk_guionly.py Merged revisions 70734,70775,70856,70874,70876-70877 via svnmerge 2009-03-31 23:16:50 +00:00
test_ttk_textonly.py Merged revisions 70734,70775,70856,70874,70876-70877 via svnmerge 2009-03-31 23:16:50 +00:00
test_tuple.py Merged revisions 76764 via svnmerge from 2009-12-12 19:26:06 +00:00
test_typechecks.py Issue #2534: speed up isinstance() and issubclass() by 50-70%, so as to 2008-08-26 22:40:48 +00:00
test_types.py Merged revisions 84320 via svnmerge from 2010-08-25 23:19:30 +00:00
test_ucn.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_unary.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_unicode.py Merged revisions 83966 via svnmerge from 2010-08-13 00:12:59 +00:00
test_unicode_file.py Recorded merge of revisions 83987 via svnmerge from 2010-09-10 12:32:58 +00:00
test_unicodedata.py Merged revisions 78649 via svnmerge from 2010-03-04 12:48:27 +00:00
test_unittest.py Merged revisions 73718,73721,73723 via svnmerge from 2009-08-13 08:52:53 +00:00
test_univnewlines.py Merged revisions 72979 via svnmerge from 2009-05-28 06:09:08 +00:00
test_unpack.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_unpack_ex.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_urllib.py Fix test failure with -bb, because of r84040. 2010-08-14 23:12:27 +00:00
test_urllib2.py Merged revisions 83212,83829,83833,83838-83839,83878,84019,84025,84028,84032,84036 via svnmerge from 2010-08-14 18:24:40 +00:00
test_urllib2_localnet.py Merged revisions 83212,83829,83833,83838-83839,83878,84019,84025,84028,84032,84036 via svnmerge from 2010-08-14 18:24:40 +00:00
test_urllib2net.py Merged revisions 85025 via svnmerge from 2010-09-27 01:28:10 +00:00
test_urllib_response.py Add __enter__ and __exit__ methods to addbase() so that it supports with. 2009-03-26 21:34:20 +00:00
test_urllibnet.py Merged revisions 80677 via svnmerge from 2010-05-01 08:32:23 +00:00
test_urlparse.py Merged revisions 83701 via svnmerge from 2010-08-04 04:53:07 +00:00
test_userdict.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_userlist.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_userstring.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
test_uu.py merge the io-c branch: C implementation of the io module 2009-03-04 00:14:51 +00:00
test_uuid.py Merged revisions 76884-76885,76887,76889-76890,76895 via svnmerge from 2010-10-06 07:12:17 +00:00
test_wait3.py Merged revisions 70554,70588-70589,70598,70605,70611-70621,70623-70624,70626-70627 via svnmerge from 2009-03-28 21:42:05 +00:00
test_wait4.py Merged revisions 70930 via svnmerge from 2009-03-31 23:50:31 +00:00
test_warnings.py Fix test_warnings on Windows (don't change current directory) 2010-05-20 21:42:00 +00:00
test_wave.py Merged revisions 77459 via svnmerge from 2010-01-13 03:53:14 +00:00
test_weakref.py (note: svnmerged from py3k, but the original message was wrong) 2010-01-08 17:56:16 +00:00
test_weakset.py (note: svnmerged from py3k, but the original message was wrong) 2010-01-08 17:56:16 +00:00
test_winreg.py Merged revisions 81547 via svnmerge from 2010-05-26 18:09:32 +00:00
test_winsound.py Merged revisions 83927 via svnmerge from 2010-08-10 00:48:49 +00:00
test_with.py Merged revisions 73186,73206,73212 via svnmerge from 2009-06-04 10:21:10 +00:00
test_wsgiref.py Merged revisions 76090 via svnmerge from 2009-11-03 17:21:14 +00:00
test_xdrlib.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_xml_etree.py Merged revisions 78123 via svnmerge from 2010-02-09 16:53:09 +00:00
test_xml_etree_c.py Merged revisions 70734,70775,70856,70874,70876-70877 via svnmerge 2009-03-31 23:16:50 +00:00
test_xmlrpc.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_xmlrpc_net.py 3.x is the new trunk 2010-07-09 19:39:56 +00:00
test_zipfile.py Merged revisions 84737 via svnmerge from 2010-09-12 14:55:22 +00:00
test_zipfile64.py #2971: test_zipfile64 fails. 2008-11-12 01:57:36 +00:00
test_zipimport.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_zipimport_support.py Merged revisions 73715 via svnmerge from 2009-08-13 08:51:18 +00:00
test_zlib.py Merged revisions 81100 via svnmerge from 2010-05-11 23:49:58 +00:00
testcodec.py Merging the py3k-pep3137 branch back into the py3k branch. 2007-11-06 21:34:58 +00:00
testtar.tar Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60734 via svnmerge from 2008-02-11 22:57:17 +00:00
tf_inherit_check.py Issue #3782: os.write() must not accept unicode strings 2008-09-15 23:02:56 +00:00
threaded_import_hangers.py Merged revisions 64125 via svnmerge from 2008-06-11 19:14:14 +00:00
time_hashlib.py Raise statement normalization in Lib/test/. 2007-08-29 23:37:32 +00:00
tokenize_tests-latin1-coding-cookie-and-utf8-bom-sig.txt Ran svneol.py 2008-06-13 23:34:35 +00:00
tokenize_tests-no-coding-cookie-and-utf8-bom-sig-only.txt Ran svneol.py 2008-06-13 23:34:35 +00:00
tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt Ran svneol.py 2008-06-13 23:34:35 +00:00
tokenize_tests-utf8-coding-cookie-and-utf8-bom-sig.txt Ran svneol.py 2008-06-13 23:34:35 +00:00
tokenize_tests.txt Patch 1420 by Ron Adam. 2007-11-12 17:40:10 +00:00
warning_tests.py Merged revisions 53952-54987 via svnmerge from 2007-04-27 19:54:29 +00:00
xmltests.py #2621 rename test.test_support to test.support 2008-05-20 21:35:26 +00:00
zipdir.zip Merged revisions 68885 via svnmerge from 2009-01-24 14:10:07 +00:00