Mailman 3 June 2011 - Python-checkins

devguide: Add a communications section to the devguide FAQ (closes #11690)
by nick.coghlan July 21, 2011

July 21, 2011

http://hg.python.org/devguide/rev/f1ebfb53437f changeset: 431:f1ebfb53437f user: Nick Coghlan <ncoghlan(a)gmail.com> date: Mon Jun 20 00:46:57 2011 +1000 summary: Add a communications section to the devguide FAQ (closes #11690) files: faq.rst | 102 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 101 insertions(+), 1 deletions(-) diff --git a/faq.rst b/faq.rst --- a/faq.rst +++ b/faq.rst @@ -8,8 +8,108 @@ .. contents:: :local: + +Communications +============== + + +Where should I ask general Python questions? +-------------------------------------------- + +General Python questions should still go to `python-list`_ or `python-tutor`_ +or similar resources, such as StackOverflow_ or ``#python`` on IRC. + +.. _python-list: http://mail.python.org/mailman/listinfo/python-list +.. _python-tutor: http://mail.python.org/mailman/listinfo/python-tutor +.. _StackOverflow: http://stackoverflow.com/ + + +Where should I suggest new features and language changes? +--------------------------------------------------------- + +The `python-ideas`_ mailing list is specifically intended for discussion of +new features and language changes. Please don't be disappointed if your +idea isn't met with universal approval: as the long list of Rejected and +Withdrawn PEPs in the `PEP Index`_ attests, and as befits a reasonably mature +programming language, getting significant changes into Python isn't a simple +task. + +If the idea is reasonable, someone will suggest posting it as a feature +request on the `issue tracker`_. + +.. _python-ideas: http://mail.python.org/mailman/listinfo/python-ideas +.. _issue tracker: http://bugs.python.org +.. _PEP Index: http://www.python.org/dev/peps + + +Where should I ask general questions about contributing to CPython? +------------------------------------------------------------------- + +The `Python Mentors`_ program is specifically about encouraging +developers and others that would like to contribute to Python development in +general, rather than necessarily being focused on one particular issue. + +.. _Python Mentors: http://pythonmentors.com + + +Where should I report specific problems? +---------------------------------------- + +Specific problems should be posted to the `issue tracker`_. + + +What if I'm not sure it is a bug? +--------------------------------- + +The general Python help locations listed above are the best place to start +with that kind of question. If they agree it looks like a bug, then the +next step is to either post it to the `issue tracker`_ or else to ask further +on the core development mailing list, `python-dev`_. + +.. _python-dev: http://mail.python.org/mailman/listinfo/python-dev + + +What if I disagree with an issue resolution on the tracker? +----------------------------------------------------------- + +First, take some time to consider any comments made in association with the +resolution of the tracker issue. On reflection, they may seem more reasonable +than they first appeared. + +If you still feel the resolution is incorrect, then raise the question on +`python-dev`_. If the consensus there supports the disputed resolution, please +take any further objections to `python-ideas`_ (or some other forum). Further +argument on `python-dev`_ after a consensus has been reached amongst the core +developers is unlikely to win any converts. + + +How do I tell who is and isn't a core developer? +------------------------------------------------ + +You can check their name against the `full list of developers`_ with commit +rights to the main source control repository. + +On the `issue tracker`_, most core developers will have the Python logo +appear next to their name. + +.. _full list of developers: http://www.python.org/dev/committers + + +What standards of behaviour are expected in these communication channels? +------------------------------------------------------------------------- + +We try to foster environments of mutual respect, tolerance and encouragement, +as described in the PSF's `Diversity Statement`_. Abiding by the guidelines +in this document and asking questions or posting suggestions in the +appropriate channels are an excellent way to get started on the mutual respect +part, greatly increasing the chances of receiving tolerance and encouragement +in return. + +.. _Diversity Statement: http://www.python.org/psf/diversity/ + + Version Control -================================== +=============== Where can I learn about the version control system used, Mercurial (hg)? ------------------------------------------------------------------------------- -- Repository URL: http://hg.python.org/devguide

5 4

cpython: Issue #12451: Add support.create_empty_file()
by victor.stinner July 2, 2011

July 2, 2011

http://hg.python.org/cpython/rev/0c49260e85a0 changeset: 71103:0c49260e85a0 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Jun 30 23:25:47 2011 +0200 summary: Issue #12451: Add support.create_empty_file() We don't need to create a temporary buffered binary or text file object just to create an empty file. Replace also os.fdopen(handle).close() by os.close(handle). files: Lib/distutils/tests/test_build_py.py | 6 ++-- Lib/test/support.py | 7 ++++- Lib/test/test_dbm.py | 4 +- Lib/test/test_glob.py | 6 ++-- Lib/test/test_imp.py | 3 +- Lib/test/test_import.py | 4 +- Lib/test/test_mailbox.py | 3 +- Lib/test/test_optparse.py | 2 +- Lib/test/test_os.py | 3 +- Lib/test/test_pkgimport.py | 4 +- Lib/test/test_posix.py | 8 ++-- Lib/test/test_reprlib.py | 23 +++++++-------- Lib/test/test_runpy.py | 12 +++---- Lib/test/test_shutil.py | 5 +-- Lib/test/test_tarfile.py | 6 ++-- Lib/test/test_unicode_file.py | 5 +-- Lib/test/test_zipimport.py | 2 +- 17 files changed, 50 insertions(+), 53 deletions(-) diff --git a/Lib/distutils/tests/test_build_py.py b/Lib/distutils/tests/test_build_py.py --- a/Lib/distutils/tests/test_build_py.py +++ b/Lib/distutils/tests/test_build_py.py @@ -10,7 +10,7 @@ from distutils.errors import DistutilsFileError from distutils.tests import support -from test.support import run_unittest +from test.support import run_unittest, create_empty_file class BuildPyTestCase(support.TempdirManager, @@ -71,11 +71,11 @@ # create the distribution files. sources = self.mkdtemp() - open(os.path.join(sources, "__init__.py"), "w").close() + create_empty_file(os.path.join(sources, "__init__.py")) testdir = os.path.join(sources, "doc") os.mkdir(testdir) - open(os.path.join(testdir, "testfile"), "w").close() + create_empty_file(os.path.join(testdir, "testfile")) os.chdir(sources) old_stdout = sys.stdout diff --git a/Lib/test/support.py b/Lib/test/support.py --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -40,7 +40,7 @@ "is_resource_enabled", "requires", "requires_linux_version", "requires_mac_ver", "find_unused_port", "bind_port", "IPV6_ENABLED", "is_jython", "TESTFN", "HOST", "SAVEDCWD", "temp_cwd", - "findfile", "sortdict", "check_syntax_error", "open_urlresource", + "findfile", "create_empty_file", "sortdict", "check_syntax_error", "open_urlresource", "check_warnings", "CleanImport", "EnvironmentVarGuard", "TransientResource", "captured_stdout", "captured_stdin", "captured_stderr", "time_out", "socket_peer_reset", "ioerror_peer_reset", "run_with_locale", 'temp_umask', @@ -596,6 +596,11 @@ if os.path.exists(fn): return fn return file +def create_empty_file(filename): + """Create an empty file. If the file already exists, truncate it.""" + fd = os.open(filename, os.O_WRONLY | os.O_CREAT | os.O_TRUNC) + os.close(fd) + def sortdict(dict): "Like repr(dict), but in sorted order." items = sorted(dict.items()) diff --git a/Lib/test/test_dbm.py b/Lib/test/test_dbm.py --- a/Lib/test/test_dbm.py +++ b/Lib/test/test_dbm.py @@ -71,8 +71,8 @@ f.close() def test_anydbm_creation_n_file_exists_with_invalid_contents(self): - with open(_fname, "w") as w: - pass # create an empty file + # create an empty file + test.support.create_empty_file(_fname) f = dbm.open(_fname, 'n') self.addCleanup(f.close) diff --git a/Lib/test/test_glob.py b/Lib/test/test_glob.py --- a/Lib/test/test_glob.py +++ b/Lib/test/test_glob.py @@ -1,5 +1,6 @@ import unittest -from test.support import run_unittest, TESTFN, skip_unless_symlink, can_symlink +from test.support import (run_unittest, TESTFN, skip_unless_symlink, + can_symlink, create_empty_file) import glob import os import shutil @@ -14,8 +15,7 @@ base, file = os.path.split(filename) if not os.path.exists(base): os.makedirs(base) - f = open(filename, 'w') - f.close() + create_empty_file(filename) def setUp(self): self.tempdir = TESTFN+"_dir" diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py --- a/Lib/test/test_imp.py +++ b/Lib/test/test_imp.py @@ -324,8 +324,7 @@ shutil.rmtree('pep3147') self.addCleanup(cleanup) # Touch the __init__.py file. - with open('pep3147/__init__.py', 'w'): - pass + support.create_empty_file('pep3147/__init__.py') m = __import__('pep3147') # Ensure we load the pyc file. support.forget('pep3147') diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py --- a/Lib/test/test_import.py +++ b/Lib/test/test_import.py @@ -14,7 +14,7 @@ from test.support import ( EnvironmentVarGuard, TESTFN, check_warnings, forget, is_jython, make_legacy_pyc, rmtree, run_unittest, swap_attr, swap_item, temp_umask, - unlink, unload) + unlink, unload, create_empty_file) from test import script_helper @@ -103,7 +103,7 @@ sys.path.insert(0, os.curdir) try: fname = TESTFN + os.extsep + "py" - open(fname, 'w').close() + create_empty_file(fname) os.chmod(fname, (stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)) __import__(TESTFN) diff --git a/Lib/test/test_mailbox.py b/Lib/test/test_mailbox.py --- a/Lib/test/test_mailbox.py +++ b/Lib/test/test_mailbox.py @@ -902,8 +902,7 @@ # Now, write something into cur and remove it. This changes # the mtime and should cause a re-read. filename = os.path.join(self._path, 'cur', 'stray-file') - f = open(filename, 'w') - f.close() + support.create_empty_file(filename) os.unlink(filename) self._box._refresh() self.assertTrue(refreshed()) diff --git a/Lib/test/test_optparse.py b/Lib/test/test_optparse.py --- a/Lib/test/test_optparse.py +++ b/Lib/test/test_optparse.py @@ -1023,7 +1023,7 @@ TYPE_CHECKER["file"] = check_file def test_filetype_ok(self): - open(support.TESTFN, "w").close() + support.create_empty_file(support.TESTFN) self.assertParseOK(["--file", support.TESTFN, "-afoo"], {'file': support.TESTFN, 'a': 'foo'}, []) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -1028,8 +1028,7 @@ os.mkdir(self.dir) try: for fn in bytesfn: - f = open(os.path.join(self.bdir, fn), "w") - f.close() + support.create_empty_file(os.path.join(self.bdir, fn)) fn = os.fsdecode(fn) if fn in self.unicodefn: raise ValueError("duplicate filename") diff --git a/Lib/test/test_pkgimport.py b/Lib/test/test_pkgimport.py --- a/Lib/test/test_pkgimport.py +++ b/Lib/test/test_pkgimport.py @@ -7,7 +7,7 @@ import unittest from imp import cache_from_source -from test.support import run_unittest +from test.support import run_unittest, create_empty_file class TestImport(unittest.TestCase): @@ -29,7 +29,7 @@ self.package_dir = os.path.join(self.test_dir, self.package_name) os.mkdir(self.package_dir) - open(os.path.join(self.package_dir, '__init__.py'), 'w').close() + create_empty_file(os.path.join(self.package_dir, '__init__.py')) self.module_path = os.path.join(self.package_dir, 'foo.py') def tearDown(self): diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py --- a/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py @@ -410,7 +410,7 @@ self.assertRaises(OSError, posix.chown, support.TESTFN, -1, -1) # re-create the file - open(support.TESTFN, 'w').close() + support.create_empty_file(support.TESTFN) self._test_all_chown_common(posix.chown, support.TESTFN) @unittest.skipUnless(hasattr(posix, 'fchown'), "test needs os.fchown()") @@ -661,7 +661,7 @@ @unittest.skipUnless(hasattr(posix, 'fchownat'), "test needs posix.fchownat()") def test_fchownat(self): support.unlink(support.TESTFN) - open(support.TESTFN, 'w').close() + support.create_empty_file(support.TESTFN) f = posix.open(posix.getcwd(), posix.O_RDONLY) try: @@ -766,7 +766,7 @@ @unittest.skipUnless(hasattr(posix, 'renameat'), "test needs posix.renameat()") def test_renameat(self): support.unlink(support.TESTFN) - open(support.TESTFN + 'ren', 'w').close() + support.create_empty_file(support.TESTFN + 'ren') f = posix.open(posix.getcwd(), posix.O_RDONLY) try: posix.renameat(f, support.TESTFN + 'ren', f, support.TESTFN) @@ -791,7 +791,7 @@ @unittest.skipUnless(hasattr(posix, 'unlinkat'), "test needs posix.unlinkat()") def test_unlinkat(self): f = posix.open(posix.getcwd(), posix.O_RDONLY) - open(support.TESTFN + 'del', 'w').close() + support.create_empty_file(support.TESTFN + 'del') posix.stat(support.TESTFN + 'del') # should not throw exception try: posix.unlinkat(f, support.TESTFN + 'del') diff --git a/Lib/test/test_reprlib.py b/Lib/test/test_reprlib.py --- a/Lib/test/test_reprlib.py +++ b/Lib/test/test_reprlib.py @@ -8,7 +8,7 @@ import shutil import unittest -from test.support import run_unittest +from test.support import run_unittest, create_empty_file from reprlib import repr as r # Don't shadow builtin repr from reprlib import Repr from reprlib import recursive_repr @@ -193,10 +193,9 @@ r(y) r(z) -def touch(path, text=''): - fp = open(path, 'w') - fp.write(text) - fp.close() +def write_file(path, text): + with open(path, 'w', encoding='ASCII') as fp: + fp.write(text) class LongReprTest(unittest.TestCase): def setUp(self): @@ -206,10 +205,10 @@ # Make the package and subpackage shutil.rmtree(self.pkgname, ignore_errors=True) os.mkdir(self.pkgname) - touch(os.path.join(self.pkgname, '__init__.py')) + create_empty_file(os.path.join(self.pkgname, '__init__.py')) shutil.rmtree(self.subpkgname, ignore_errors=True) os.mkdir(self.subpkgname) - touch(os.path.join(self.subpkgname, '__init__.py')) + create_empty_file(os.path.join(self.subpkgname, '__init__.py')) # Remember where we are self.here = os.getcwd() sys.path.insert(0, self.here) @@ -231,7 +230,7 @@ def test_module(self): eq = self.assertEqual - touch(os.path.join(self.subpkgname, self.pkgname + '.py')) + create_empty_file(os.path.join(self.subpkgname, self.pkgname + '.py')) from areallylongpackageandmodulenametotestreprtruncation.areallylongpackageandmodulenametotestreprtruncation import areallylongpackageandmodulenametotestreprtruncation eq(repr(areallylongpackageandmodulenametotestreprtruncation), "<module %r from %r>" % (areallylongpackageandmodulenametotestreprtruncation.__name__, areallylongpackageandmodulenametotestreprtruncation.__file__)) @@ -239,7 +238,7 @@ def test_type(self): eq = self.assertEqual - touch(os.path.join(self.subpkgname, 'foo.py'), '''\ + write_file(os.path.join(self.subpkgname, 'foo.py'), '''\ class foo(object): pass ''') @@ -253,7 +252,7 @@ pass def test_class(self): - touch(os.path.join(self.subpkgname, 'bar.py'), '''\ + write_file(os.path.join(self.subpkgname, 'bar.py'), '''\ class bar: pass ''') @@ -262,7 +261,7 @@ self.assertEqual(repr(bar.bar), "<class '%s.bar'>" % bar.__name__) def test_instance(self): - touch(os.path.join(self.subpkgname, 'baz.py'), '''\ + write_file(os.path.join(self.subpkgname, 'baz.py'), '''\ class baz: pass ''') @@ -273,7 +272,7 @@ def test_method(self): eq = self.assertEqual - touch(os.path.join(self.subpkgname, 'qux.py'), '''\ + write_file(os.path.join(self.subpkgname, 'qux.py'), '''\ class aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa: def amethod(self): pass ''') diff --git a/Lib/test/test_runpy.py b/Lib/test/test_runpy.py --- a/Lib/test/test_runpy.py +++ b/Lib/test/test_runpy.py @@ -7,7 +7,8 @@ import tempfile import py_compile from test.support import ( - forget, make_legacy_pyc, run_unittest, unload, verbose, no_tracing) + forget, make_legacy_pyc, run_unittest, unload, verbose, no_tracing, + create_empty_file) from test.script_helper import ( make_pkg, make_script, make_zip_pkg, make_zip_script, temp_dir) @@ -113,8 +114,7 @@ def _add_pkg_dir(self, pkg_dir): os.mkdir(pkg_dir) pkg_fname = os.path.join(pkg_dir, "__init__.py") - pkg_file = open(pkg_fname, "w") - pkg_file.close() + create_empty_file(pkg_fname) return pkg_fname def _make_pkg(self, source, depth, mod_base="runpy_test"): @@ -219,8 +219,7 @@ module_dir = os.path.join(module_dir, pkg_name) # Add sibling module sibling_fname = os.path.join(module_dir, "sibling.py") - sibling_file = open(sibling_fname, "w") - sibling_file.close() + create_empty_file(sibling_fname) if verbose: print(" Added sibling module:", sibling_fname) # Add nephew module uncle_dir = os.path.join(parent_dir, "uncle") @@ -230,8 +229,7 @@ self._add_pkg_dir(cousin_dir) if verbose: print(" Added cousin package:", cousin_dir) nephew_fname = os.path.join(cousin_dir, "nephew.py") - nephew_file = open(nephew_fname, "w") - nephew_file.close() + create_empty_file(nephew_fname) if verbose: print(" Added nephew module:", nephew_fname) def _check_relative_imports(self, depth, run_name=None): diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -107,8 +107,7 @@ self.errorState = 0 os.mkdir(TESTFN) self.childpath = os.path.join(TESTFN, 'a') - f = open(self.childpath, 'w') - f.close() + support.create_empty_file(self.childpath) old_dir_mode = os.stat(TESTFN).st_mode old_child_mode = os.stat(self.childpath).st_mode # Make unwritable. @@ -156,7 +155,7 @@ def test_rmtree_dont_delete_file(self): # When called on a file instead of a directory, don't delete it. handle, path = tempfile.mkstemp() - os.fdopen(handle).close() + os.close(handle) self.assertRaises(OSError, shutil.rmtree, path) os.remove(path) diff --git a/Lib/test/test_tarfile.py b/Lib/test/test_tarfile.py --- a/Lib/test/test_tarfile.py +++ b/Lib/test/test_tarfile.py @@ -893,7 +893,7 @@ try: for name in ("foo", "bar", "baz"): name = os.path.join(tempdir, name) - open(name, "wb").close() + support.create_empty_file(name) exclude = os.path.isfile @@ -920,7 +920,7 @@ try: for name in ("foo", "bar", "baz"): name = os.path.join(tempdir, name) - open(name, "wb").close() + support.create_empty_file(name) def filter(tarinfo): if os.path.basename(tarinfo.name) == "bar": @@ -959,7 +959,7 @@ # and compare the stored name with the original. foo = os.path.join(TEMPDIR, "foo") if not dir: - open(foo, "w").close() + support.create_empty_file(foo) else: os.mkdir(foo) diff --git a/Lib/test/test_unicode_file.py b/Lib/test/test_unicode_file.py --- a/Lib/test/test_unicode_file.py +++ b/Lib/test/test_unicode_file.py @@ -6,7 +6,7 @@ import unittest from test.support import (run_unittest, rmtree, - TESTFN_ENCODING, TESTFN_UNICODE, TESTFN_UNENCODABLE) + TESTFN_ENCODING, TESTFN_UNICODE, TESTFN_UNENCODABLE, create_empty_file) if not os.path.supports_unicode_filenames: try: @@ -99,8 +99,7 @@ # top-level 'test' functions would be if they could take params def _test_single(self, filename): remove_if_exists(filename) - f = open(filename, "w") - f.close() + create_empty_file(filename) try: self._do_single(filename) finally: diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py --- a/Lib/test/test_zipimport.py +++ b/Lib/test/test_zipimport.py @@ -411,7 +411,7 @@ def testEmptyFile(self): support.unlink(TESTMOD) - open(TESTMOD, 'w+').close() + support.create_empty_file(TESTMOD) self.assertZipFailure(TESTMOD) def testFileUnreadable(self): -- Repository URL: http://hg.python.org/cpython

2 1

cpython (merge 3.2 -> default): Issue #12407: Explicitly skip test_capi.EmbeddingTest under Windows.
by antoine.pitrou June 30, 2011

June 30, 2011

http://hg.python.org/cpython/rev/5cae52417b9d changeset: 71102:5cae52417b9d parent: 71100:0cef8cac71c8 parent: 71101:7c60c1b41da9 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Thu Jun 30 20:04:06 2011 +0200 summary: Issue #12407: Explicitly skip test_capi.EmbeddingTest under Windows. files: Lib/test/test_capi.py | 3 +++ Misc/NEWS | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -145,6 +145,9 @@ class EmbeddingTest(unittest.TestCase): + @unittest.skipIf( + sys.platform.startswith('win'), + "test doesn't work under Windows") def test_subinterps(self): # XXX only tested under Unix checkouts basepath = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -938,6 +938,8 @@ Tests ----- +- Issue #12407: Explicitly skip test_capi.EmbeddingTest under Windows. + - Issue #12400: regrtest -W doesn't rerun the tests twice anymore, but captures the output and displays it on failure instead. regrtest -v doesn't print the error twice anymore if there is only one error. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12407: Explicitly skip test_capi.EmbeddingTest under Windows.
by antoine.pitrou June 30, 2011

June 30, 2011

http://hg.python.org/cpython/rev/7c60c1b41da9 changeset: 71101:7c60c1b41da9 branch: 3.2 parent: 71097:68bc1a29ba5a user: Antoine Pitrou <solipsis(a)pitrou.net> date: Thu Jun 30 20:02:54 2011 +0200 summary: Issue #12407: Explicitly skip test_capi.EmbeddingTest under Windows. files: Lib/test/test_capi.py | 3 +++ Misc/NEWS | 2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -145,6 +145,9 @@ class EmbeddingTest(unittest.TestCase): + @unittest.skipIf( + sys.platform.startswith('win'), + "test doesn't work under Windows") def test_subinterps(self): # XXX only tested under Unix checkouts basepath = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -136,6 +136,8 @@ Tests ----- +- Issue #12407: Explicitly skip test_capi.EmbeddingTest under Windows. + - Issue #12400: regrtest -W doesn't rerun the tests twice anymore, but captures the output and displays it on failure instead. regrtest -v doesn't print the error twice anymore if there is only one error. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue 12139: ftplib - remove 'post CCC' test to fix various buildot failures
by giampaolo.rodola June 30, 2011

June 30, 2011

http://hg.python.org/cpython/rev/0cef8cac71c8 changeset: 71100:0cef8cac71c8 user: Giampaolo Rodola' <g.rodola(a)gmail.com> date: Thu Jun 30 18:34:41 2011 +0200 summary: Issue 12139: ftplib - remove 'post CCC' test to fix various buildot failures due to dummy test server not properly handling SSL shutdown(), see http://bugs.python.org/msg139499 files: Lib/test/test_ftplib.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -887,8 +887,6 @@ self.assertIsInstance(self.client.sock, ssl.SSLSocket) self.client.ccc() self.assertRaises(ValueError, self.client.sock.unwrap) - self.client.sendcmd('noop') - self.client.quit() class TestTimeouts(TestCase): -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #12451: Open the test file in binary mode in test_bz2, the text file is
by victor.stinner June 30, 2011

June 30, 2011

http://hg.python.org/cpython/rev/c4388478f9b2 changeset: 71099:c4388478f9b2 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Jun 30 18:25:07 2011 +0200 summary: Issue #12451: Open the test file in binary mode in test_bz2, the text file is not needed. files: Lib/test/test_bz2.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -340,7 +340,7 @@ def testFileno(self): self.createTempFile() - with open(self.filename) as rawf: + with open(self.filename, 'rb') as rawf: with BZ2File(fileobj=rawf) as bz2f: self.assertEqual(bz2f.fileno(), rawf.fileno()) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12451: Open files in binary mode in some tests when the text file is not
by victor.stinner June 30, 2011

June 30, 2011

http://hg.python.org/cpython/rev/68bc1a29ba5a changeset: 71097:68bc1a29ba5a branch: 3.2 parent: 71095:45e3dafb3dbe user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Jun 30 18:20:11 2011 +0200 summary: Issue #12451: Open files in binary mode in some tests when the text file is not needed. Remove also an unused variable (blank) in test_threading. files: Lib/test/test_fcntl.py | 4 ++-- Lib/test/test_ioctl.py | 6 +++--- Lib/test/test_mmap.py | 6 +++--- Lib/test/test_os.py | 13 ++++++------- Lib/test/test_threading.py | 5 ++--- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py --- a/Lib/test/test_fcntl.py +++ b/Lib/test/test_fcntl.py @@ -62,7 +62,7 @@ def test_fcntl_fileno(self): # the example from the library docs - self.f = open(TESTFN, 'w') + self.f = open(TESTFN, 'wb') rv = fcntl.fcntl(self.f.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) if verbose: print('Status from fcntl with O_NONBLOCK: ', rv) @@ -74,7 +74,7 @@ def test_fcntl_file_descriptor(self): # again, but pass the file rather than numeric descriptor - self.f = open(TESTFN, 'w') + self.f = open(TESTFN, 'wb') rv = fcntl.fcntl(self.f, fcntl.F_SETFL, os.O_NONBLOCK) if sys.platform not in ['os2emx']: rv = fcntl.fcntl(self.f, fcntl.F_SETLKW, lockdata) diff --git a/Lib/test/test_ioctl.py b/Lib/test/test_ioctl.py --- a/Lib/test/test_ioctl.py +++ b/Lib/test/test_ioctl.py @@ -7,7 +7,7 @@ get_attribute(termios, 'TIOCGPGRP') #Can't run tests without this feature try: - tty = open("/dev/tty", "r") + tty = open("/dev/tty", "rb") except IOError: raise unittest.SkipTest("Unable to open /dev/tty") else: @@ -30,7 +30,7 @@ # If this process has been put into the background, TIOCGPGRP returns # the session ID instead of the process group id. ids = (os.getpgrp(), os.getsid(0)) - with open("/dev/tty", "r") as tty: + with open("/dev/tty", "rb") as tty: r = fcntl.ioctl(tty, termios.TIOCGPGRP, " ") rpgrp = struct.unpack("i", r)[0] self.assertIn(rpgrp, ids) @@ -47,7 +47,7 @@ self.assertEqual(len(buf) * intsize, nbytes) # sanity check else: buf.append(fill) - with open("/dev/tty", "r") as tty: + with open("/dev/tty", "rb") as tty: r = fcntl.ioctl(tty, termios.TIOCGPGRP, buf, 1) rpgrp = buf[0] self.assertEqual(r, 0) diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py --- a/Lib/test/test_mmap.py +++ b/Lib/test/test_mmap.py @@ -108,7 +108,7 @@ # Check that the underlying file is truncated too # (bug #728515) - f = open(TESTFN) + f = open(TESTFN, 'rb') try: f.seek(0, 2) self.assertEqual(f.tell(), 512) @@ -308,7 +308,7 @@ f.write(2**16 * b'a') # Arbitrary character f.close() - f = open(TESTFN) + f = open(TESTFN, 'rb') mf = mmap.mmap(f.fileno(), 2**16, access=mmap.ACCESS_READ) mf.close() mf.close() @@ -501,7 +501,7 @@ self.assertEqual(m[0:3], b'foo') # Check that the underlying file is truncated too - f = open(TESTFN) + f = open(TESTFN, 'rb') f.seek(0, 2) self.assertEqual(f.tell(), halfsize + 512) f.close() diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -689,12 +689,11 @@ class DevNullTests(unittest.TestCase): def test_devnull(self): - f = open(os.devnull, 'w') - f.write('hello') - f.close() - f = open(os.devnull, 'r') - self.assertEqual(f.read(), '') - f.close() + with open(os.devnull, 'wb') as f: + f.write(b'hello') + f.close() + with open(os.devnull, 'rb') as f: + self.assertEqual(f.read(), b'') class URandomTests(unittest.TestCase): def test_urandom(self): @@ -1044,7 +1043,7 @@ def test_open(self): for fn in self.unicodefn: - f = open(os.path.join(self.dir, fn)) + f = open(os.path.join(self.dir, fn), 'rb') f.close() def test_stat(self): diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -642,11 +642,10 @@ def random_io(): '''Loop for a while sleeping random tiny amounts and doing some I/O.''' - blank = b'x' * 200 while True: - in_f = open(os.__file__, 'r') + in_f = open(os.__file__, 'rb') stuff = in_f.read(200) - null_f = open(os.devnull, 'w') + null_f = open(os.devnull, 'wb') null_f.write(stuff) time.sleep(random.random() / 1995) null_f.close() -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): (merge 3.2) Issue #12451: Open files in binary mode in some tests when the text
by victor.stinner June 30, 2011

June 30, 2011

http://hg.python.org/cpython/rev/3969b6377f52 changeset: 71098:3969b6377f52 parent: 71096:e8eea84a90dc parent: 71097:68bc1a29ba5a user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Jun 30 18:21:39 2011 +0200 summary: (merge 3.2) Issue #12451: Open files in binary mode in some tests when the text file is not needed. Remove also an unused variable (blank) in test_threading. files: Lib/test/test_fcntl.py | 4 ++-- Lib/test/test_ioctl.py | 6 +++--- Lib/test/test_mmap.py | 6 +++--- Lib/test/test_os.py | 13 ++++++------- Lib/test/test_threading.py | 5 ++--- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py --- a/Lib/test/test_fcntl.py +++ b/Lib/test/test_fcntl.py @@ -62,7 +62,7 @@ def test_fcntl_fileno(self): # the example from the library docs - self.f = open(TESTFN, 'w') + self.f = open(TESTFN, 'wb') rv = fcntl.fcntl(self.f.fileno(), fcntl.F_SETFL, os.O_NONBLOCK) if verbose: print('Status from fcntl with O_NONBLOCK: ', rv) @@ -74,7 +74,7 @@ def test_fcntl_file_descriptor(self): # again, but pass the file rather than numeric descriptor - self.f = open(TESTFN, 'w') + self.f = open(TESTFN, 'wb') rv = fcntl.fcntl(self.f, fcntl.F_SETFL, os.O_NONBLOCK) if sys.platform not in ['os2emx']: rv = fcntl.fcntl(self.f, fcntl.F_SETLKW, lockdata) diff --git a/Lib/test/test_ioctl.py b/Lib/test/test_ioctl.py --- a/Lib/test/test_ioctl.py +++ b/Lib/test/test_ioctl.py @@ -7,7 +7,7 @@ get_attribute(termios, 'TIOCGPGRP') #Can't run tests without this feature try: - tty = open("/dev/tty", "r") + tty = open("/dev/tty", "rb") except IOError: raise unittest.SkipTest("Unable to open /dev/tty") else: @@ -30,7 +30,7 @@ # If this process has been put into the background, TIOCGPGRP returns # the session ID instead of the process group id. ids = (os.getpgrp(), os.getsid(0)) - with open("/dev/tty", "r") as tty: + with open("/dev/tty", "rb") as tty: r = fcntl.ioctl(tty, termios.TIOCGPGRP, " ") rpgrp = struct.unpack("i", r)[0] self.assertIn(rpgrp, ids) @@ -47,7 +47,7 @@ self.assertEqual(len(buf) * intsize, nbytes) # sanity check else: buf.append(fill) - with open("/dev/tty", "r") as tty: + with open("/dev/tty", "rb") as tty: r = fcntl.ioctl(tty, termios.TIOCGPGRP, buf, 1) rpgrp = buf[0] self.assertEqual(r, 0) diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py --- a/Lib/test/test_mmap.py +++ b/Lib/test/test_mmap.py @@ -108,7 +108,7 @@ # Check that the underlying file is truncated too # (bug #728515) - f = open(TESTFN) + f = open(TESTFN, 'rb') try: f.seek(0, 2) self.assertEqual(f.tell(), 512) @@ -308,7 +308,7 @@ f.write(2**16 * b'a') # Arbitrary character f.close() - f = open(TESTFN) + f = open(TESTFN, 'rb') mf = mmap.mmap(f.fileno(), 2**16, access=mmap.ACCESS_READ) mf.close() mf.close() @@ -530,7 +530,7 @@ self.assertEqual(m[0:3], b'foo') # Check that the underlying file is truncated too - f = open(TESTFN) + f = open(TESTFN, 'rb') f.seek(0, 2) self.assertEqual(f.tell(), halfsize + 512) f.close() diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -694,12 +694,11 @@ class DevNullTests(unittest.TestCase): def test_devnull(self): - f = open(os.devnull, 'w') - f.write('hello') - f.close() - f = open(os.devnull, 'r') - self.assertEqual(f.read(), '') - f.close() + with open(os.devnull, 'wb') as f: + f.write(b'hello') + f.close() + with open(os.devnull, 'rb') as f: + self.assertEqual(f.read(), b'') class URandomTests(unittest.TestCase): def test_urandom(self): @@ -1049,7 +1048,7 @@ def test_open(self): for fn in self.unicodefn: - f = open(os.path.join(self.dir, fn)) + f = open(os.path.join(self.dir, fn), 'rb') f.close() def test_stat(self): diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -650,11 +650,10 @@ def random_io(): '''Loop for a while sleeping random tiny amounts and doing some I/O.''' - blank = b'x' * 200 while True: - in_f = open(os.__file__, 'r') + in_f = open(os.__file__, 'rb') stuff = in_f.read(200) - null_f = open(os.devnull, 'w') + null_f = open(os.devnull, 'wb') null_f.write(stuff) time.sleep(random.random() / 1995) null_f.close() -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): (merge 3.2) Issue #12451: The XInclude default loader of xml.etree now decodes
by victor.stinner June 30, 2011

June 30, 2011

http://hg.python.org/cpython/rev/e8eea84a90dc changeset: 71096:e8eea84a90dc parent: 71094:77c589b27e90 parent: 71095:45e3dafb3dbe user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Jun 30 18:11:18 2011 +0200 summary: (merge 3.2) Issue #12451: The XInclude default loader of xml.etree now decodes files from UTF-8 instead of the locale encoding if the encoding is not specified. It now also opens XML files for the parser in binary mode instead of the text mode to avoid encoding issues. files: Lib/xml/etree/ElementInclude.py | 9 +++++---- Misc/NEWS | 5 +++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Lib/xml/etree/ElementInclude.py b/Lib/xml/etree/ElementInclude.py --- a/Lib/xml/etree/ElementInclude.py +++ b/Lib/xml/etree/ElementInclude.py @@ -67,7 +67,7 @@ # # @param href Resource reference. # @param parse Parse mode. Either "xml" or "text". -# @param encoding Optional text encoding. +# @param encoding Optional text encoding (UTF-8 by default for "text"). # @return The expanded resource. If the parse mode is "xml", this # is an ElementTree instance. If the parse mode is "text", this # is a Unicode string. If the loader fails, it can return None @@ -75,13 +75,14 @@ # @throws IOError If the loader fails to load the resource. def default_loader(href, parse, encoding=None): - file = open(href) if parse == "xml": + file = open(href, 'rb') data = ElementTree.parse(file).getroot() else: + if not encoding: + encoding = 'UTF-8' + file = open(href, 'r', encoding=encoding) data = file.read() - if encoding: - data = data.decode(encoding) file.close() return data diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -200,6 +200,11 @@ Library ------- +- Issue #12451: The XInclude default loader of xml.etree now decodes files from + UTF-8 instead of the locale encoding if the encoding is not specified. It now + also opens XML files for the parser in binary mode instead of the text mode + to avoid encoding issues. + - Issue #12451: doctest.debug_script() doesn't create a temporary file anymore to avoid encoding issues. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12451: The XInclude default loader of xml.etree now decodes files from
by victor.stinner June 30, 2011

June 30, 2011

http://hg.python.org/cpython/rev/45e3dafb3dbe changeset: 71095:45e3dafb3dbe branch: 3.2 parent: 71093:bafc5c7d24b2 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Jun 30 18:10:14 2011 +0200 summary: Issue #12451: The XInclude default loader of xml.etree now decodes files from UTF-8 instead of the locale encoding if the encoding is not specified. It now also opens XML files for the parser in binary mode instead of the text mode to avoid encoding issues. files: Lib/xml/etree/ElementInclude.py | 9 +++++---- Misc/NEWS | 5 +++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Lib/xml/etree/ElementInclude.py b/Lib/xml/etree/ElementInclude.py --- a/Lib/xml/etree/ElementInclude.py +++ b/Lib/xml/etree/ElementInclude.py @@ -67,7 +67,7 @@ # # @param href Resource reference. # @param parse Parse mode. Either "xml" or "text". -# @param encoding Optional text encoding. +# @param encoding Optional text encoding (UTF-8 by default for "text"). # @return The expanded resource. If the parse mode is "xml", this # is an ElementTree instance. If the parse mode is "text", this # is a Unicode string. If the loader fails, it can return None @@ -75,13 +75,14 @@ # @throws IOError If the loader fails to load the resource. def default_loader(href, parse, encoding=None): - file = open(href) if parse == "xml": + file = open(href, 'rb') data = ElementTree.parse(file).getroot() else: + if not encoding: + encoding = 'UTF-8' + file = open(href, 'r', encoding=encoding) data = file.read() - if encoding: - data = data.decode(encoding) file.close() return data diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -25,6 +25,11 @@ Library ------- +- Issue #12451: The XInclude default loader of xml.etree now decodes files from + UTF-8 instead of the locale encoding if the encoding is not specified. It now + also opens XML files for the parser in binary mode instead of the text mode + to avoid encoding issues. + - Issue #12451: doctest.debug_script() doesn't create a temporary file anymore to avoid encoding issues. -- Repository URL: http://hg.python.org/cpython

1 0