From cd4d4527717abc09f13fc57ca9893a1f1591f9c0 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 22 Nov 2007 00:30:02 +0000 Subject: [PATCH] Merged revisions 59077-59104 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r59078 | brett.cannon | 2007-11-20 16:16:20 -0800 (Tue, 20 Nov 2007) | 2 lines Remove a unneeded line that had typos. ........ r59081 | christian.heimes | 2007-11-20 16:46:21 -0800 (Tue, 20 Nov 2007) | 1 line Fixed #1372: zlibmodule.c: int overflow in PyZlib_decompress ........ r59082 | brett.cannon | 2007-11-20 16:47:36 -0800 (Tue, 20 Nov 2007) | 6 lines doctest assumed that a package's __loader__.get_data() method used universal newlines; it doesn't. To rectify this the string returned replaces all instances of os.linesep with '\n' to fake universal newline support. Backport candidate. ........ r59084 | brett.cannon | 2007-11-20 16:58:03 -0800 (Tue, 20 Nov 2007) | 2 lines Add a missing check before deleting a package's __loader__. ........ r59088 | christian.heimes | 2007-11-20 17:17:28 -0800 (Tue, 20 Nov 2007) | 2 lines Added NEWS entry Thanks for the reminder, Brett ........ r59089 | amaury.forgeotdarc | 2007-11-20 17:38:26 -0800 (Tue, 20 Nov 2007) | 2 lines Add a NEWS entry for r59076. ........ r59091 | christian.heimes | 2007-11-20 18:50:06 -0800 (Tue, 20 Nov 2007) | 2 lines Final fix for #1403 The Windows installer and some Linux distros are using compileall to compile all py files in the Lib/ directory. However no test exists to check if all py files can be compiled. I figured out that make testall is the easiest way to test compileall. ........ --- Lib/doctest.py | 7 +++++-- Lib/test/test_doctest.py | 20 ++++++++++++++++++-- Modules/zlibmodule.c | 5 +++-- 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/Lib/doctest.py b/Lib/doctest.py index 97bc05358f..eee2f519db 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -209,8 +209,11 @@ def _load_testfile(filename, package, module_relative, encoding): filename = _module_relative_path(package, filename) if hasattr(package, '__loader__'): if hasattr(package.__loader__, 'get_data'): - return (package.__loader__.get_data(filename).decode(encoding), - filename) + file_contents = package.__loader__.get_data(filename) + file_contents = file_contents.decode(encoding) + # get_data() opens files as 'rb', so one must do the equivalent + # conversion as universal newlines would do. + return file_contents.replace(os.linesep, '\n'), filename return open(filename, encoding=encoding).read(), filename def _indent(s, indent=4): diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index be2ffe2612..3b89097312 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -1912,6 +1912,24 @@ def test_DocFileSuite(): >>> suite.run(unittest.TestResult()) + Support for using a package's __loader__.get_data() is also + provided. + + >>> import unittest, pkgutil, test + >>> if not hasattr(test, '__loader__'): + ... test.__loader__ = pkgutil.get_loader(test) + ... added_loader = True + >>> try: + ... suite = doctest.DocFileSuite('test_doctest.txt', + ... 'test_doctest2.txt', + ... 'test_doctest4.txt', + ... package='test') + ... suite.run(unittest.TestResult()) + ... finally: + ... if added_loader: + ... del test.__loader__ + + '/' should be used as a path separator. It will be converted to a native separator at run time: @@ -1973,8 +1991,6 @@ def test_DocFileSuite(): And, you can provide setUp and tearDown functions: - You can supply setUp and teatDoen functions: - >>> def setUp(t): ... import test.test_doctest ... test.test_doctest.sillySetup = True diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c index fd6c0b790c..8f3202d773 100644 --- a/Modules/zlibmodule.c +++ b/Modules/zlibmodule.c @@ -197,10 +197,11 @@ PyZlib_decompress(PyObject *self, PyObject *args) PyObject *result_str; Byte *input; int length, err; - int wsize=DEF_WBITS, r_strlen=DEFAULTALLOC; + int wsize=DEF_WBITS; + Py_ssize_t r_strlen=DEFAULTALLOC; z_stream zst; - if (!PyArg_ParseTuple(args, "s#|ii:decompress", + if (!PyArg_ParseTuple(args, "s#|in:decompress", &input, &length, &wsize, &r_strlen)) return NULL; -- 2.49.0