Mailman 3 June 2013 - Python-checkins

cpython (2.7): Fix #17967: For ftp urls CWD to target instead of hopping to each directory
by senthil.kumaran 01 Jun '13

01 Jun '13

http://hg.python.org/cpython/rev/0a544bb539e6 changeset: 84006:0a544bb539e6 branch: 2.7 user: Senthil Kumaran <senthil(a)uthcode.com> date: Sat Jun 01 08:24:31 2013 -0700 summary: Fix #17967: For ftp urls CWD to target instead of hopping to each directory towards target. This fixes a bug where target is accessible, but parent directories are restricted. files: Lib/urllib.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Lib/urllib.py b/Lib/urllib.py --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -870,8 +870,7 @@ self.ftp = ftplib.FTP() self.ftp.connect(self.host, self.port, self.timeout) self.ftp.login(self.user, self.passwd) - for dir in self.dirs: - self.ftp.cwd(dir) + self.ftp.cwd(os.path.join(*self.dirs)) def retrfile(self, file, type): import ftplib -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Fix #16450 test_missing_localfile testcase fails on misconfigured hostname.
by senthil.kumaran 01 Jun '13

01 Jun '13

http://hg.python.org/cpython/rev/60c195e89c88 changeset: 84005:60c195e89c88 branch: 2.7 parent: 83995:6ceb5bf24da8 user: Senthil Kumaran <senthil(a)uthcode.com> date: Sat Jun 01 07:59:10 2013 -0700 summary: Fix #16450 test_missing_localfile testcase fails on misconfigured hostname. Refactor test to accomodate that and exercise the needed functionality. files: Lib/test/test_urllib.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -227,13 +227,13 @@ 'file://localhost/a/missing/file.py') fd, tmp_file = tempfile.mkstemp() tmp_fileurl = 'file://localhost/' + tmp_file.replace(os.path.sep, '/') + self.assertTrue(os.path.exists(tmp_file)) try: - self.assertTrue(os.path.exists(tmp_file)) fp = urllib.urlopen(tmp_fileurl) + fp.close() finally: os.close(fd) - fp.close() - os.unlink(tmp_file) + os.unlink(tmp_file) self.assertFalse(os.path.exists(tmp_file)) self.assertRaises(IOError, urllib.urlopen, tmp_fileurl) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: frozen modules now apparently have empty __path__
by benjamin.peterson 01 Jun '13

01 Jun '13

http://hg.python.org/cpython/rev/35da9e3ba697 changeset: 84004:35da9e3ba697 user: Benjamin Peterson <benjamin(a)python.org> date: Fri May 31 22:18:26 2013 -0700 summary: frozen modules now apparently have empty __path__ files: Lib/test/test_frozen.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_frozen.py b/Lib/test/test_frozen.py --- a/Lib/test/test_frozen.py +++ b/Lib/test/test_frozen.py @@ -36,7 +36,7 @@ else: expect.add('spam') self.assertEqual(set(dir(__phello__)), expect) - self.assertEqual(__phello__.__path__, [__phello__.__name__]) + self.assertEqual(__phello__.__path__, []) self.assertEqual(stdout.getvalue(), 'Hello world!\n') with captured_stdout() as stdout: -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (6a90817fb437): sum=0
by solipsis＠pitrou.net 01 Jun '13

01 Jun '13

results for 6a90817fb437 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/refloge5rj8r', '-x']

1 0

cpython: Issue #18065: For frozen packages set __path__ to [].
by brett.cannon 01 Jun '13

01 Jun '13

http://hg.python.org/cpython/rev/82db02a2e023 changeset: 84003:82db02a2e023 user: Brett Cannon <brett(a)python.org> date: Fri May 31 23:18:39 2013 -0400 summary: Issue #18065: For frozen packages set __path__ to []. Previously __path__ was set to [__name__], but that could lead to bad results if someone managed to circumvent the frozen importer and somehow ended up with a finder that thought __name__ was a legit directory/location. files: Doc/whatsnew/3.4.rst | 7 +++++++ Lib/test/test_importlib/frozen/test_loader.py | 2 +- Misc/NEWS | 6 ++++++ Python/import.c | 6 ++---- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -259,3 +259,10 @@ ``__package__`` unconditionally to properly support reloading. If this is not desired then you will need to set these attributes manually. You can use :func:`importlib.util.module_to_load` for module management. + +* Import now resets relevant attributes (e.g. ``__name__``, ``__loader__``, + ``__package__``, ``__file__``, ``__cached__``) unconditionally when reloading. + +* Frozen packages no longer set ``__path__`` to a list containg the package name + but an empty list instead. Determing if a module is a package should be done + using ``hasattr(module, '__path__')``. diff --git a/Lib/test/test_importlib/frozen/test_loader.py b/Lib/test/test_importlib/frozen/test_loader.py --- a/Lib/test/test_importlib/frozen/test_loader.py +++ b/Lib/test/test_importlib/frozen/test_loader.py @@ -24,7 +24,7 @@ module = machinery.FrozenImporter.load_module('__phello__') check = {'__name__': '__phello__', '__package__': '__phello__', - '__path__': ['__phello__'], + '__path__': [], '__loader__': machinery.FrozenImporter, } for attr, value in check.items(): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,12 @@ Core and Builtins ----------------- +- Issue #18065: Don't set __path__ to the package name for frozen packages. + +- Issue #18088: When reloading a module, unconditionally reset all relevant + attributes on the module (e.g. __name__, __loader__, __package__, __file__, + __cached__). + - Issue #17937: Try harder to collect cyclic garbage at shutdown. - Issue #12370: Prevent class bodies from interfering with the __class__ diff --git a/Python/import.c b/Python/import.c --- a/Python/import.c +++ b/Python/import.c @@ -1107,19 +1107,17 @@ goto err_return; } if (ispackage) { - /* Set __path__ to the package name */ + /* Set __path__ to the empty list */ PyObject *d, *l; int err; m = PyImport_AddModuleObject(name); if (m == NULL) goto err_return; d = PyModule_GetDict(m); - l = PyList_New(1); + l = PyList_New(0); if (l == NULL) { goto err_return; } - Py_INCREF(name); - PyList_SET_ITEM(l, 0, name); err = PyDict_SetItemString(d, "__path__", l); Py_DECREF(l); if (err != 0) -- Repository URL: http://hg.python.org/cpython

1 0