Mailman 3 October 2007 - Python-checkins

r58725 - sandbox/trunk/import_in_py/zipimport_/tests.py sandbox/trunk/import_in_py/zipimport_/zipimport.py
by brett.cannon Oct. 31, 2007

Oct. 31, 2007

Author: brett.cannon Date: Wed Oct 31 04:51:40 2007 New Revision: 58725 Modified: sandbox/trunk/import_in_py/zipimport_/tests.py sandbox/trunk/import_in_py/zipimport_/zipimport.py Log: zipimport.get_data() might be called with an absolute path to the zip file. Modified: sandbox/trunk/import_in_py/zipimport_/tests.py ============================================================================== --- sandbox/trunk/import_in_py/zipimport_/tests.py (original) +++ sandbox/trunk/import_in_py/zipimport_/tests.py Wed Oct 31 04:51:40 2007 @@ -47,7 +47,7 @@ py_compile.compile(code_path, doraise=True) zip_file.write(code_path + bytecode_suffix) zip_file.close() - yield zip_path + yield os.path.abspath(zip_path) finally: zip_file.close() for path in created_paths: @@ -167,6 +167,13 @@ with temp_zipfile(bytecode=False) as zip_path: importer = zipimport.zipimporter(zip_path) self.assertEqual(importer.get_data('_top_level.py'), example_code) + + def test_absolute_path(self): + with temp_zipfile(bytecode=False) as zip_path: + importer = zipimport.zipimporter(zip_path) + path = os.path.join(os.path.abspath(zip_path), '_top_level.py') + self.assertEqual(importer.get_data(path), example_code) + # XXX Test that file reading is done in binary mode. Modified: sandbox/trunk/import_in_py/zipimport_/zipimport.py ============================================================================== --- sandbox/trunk/import_in_py/zipimport_/zipimport.py (original) +++ sandbox/trunk/import_in_py/zipimport_/zipimport.py Wed Oct 31 04:51:40 2007 @@ -40,17 +40,17 @@ path = os.path.split(path)[0] else: raise ZipImportError("%s is not a zip file" % archivepath) - self.archive = path # Path to zip file. + self.archive = os.path.abspath(path) # Path to zip file. # XXX C version guarantees 'prefix' ends in a path separator. - self.prefix = archivepath[len(path)+1:] # Package directory. - if not path in _zip_directory_cache: + self.prefix = archivepath[len(self.archive)+1:] # Package directory. + if not self.archive in _zip_directory_cache: with contextlib.closing(zipfile.ZipFile(path)) as zip_file: zip_info_list = zip_file.infolist() # XXX Need to duplicate tuple from original zipimport? zip_info_dict = dict((info.filename, info) for info in zip_info_list) - _zip_directory_cache[path] = zip_info_dict - self._files = _zip_directory_cache[path] + _zip_directory_cache[self.archive] = zip_info_dict + self._files = _zip_directory_cache[self.archive] def __repr__(self): if self.prefix: @@ -134,6 +134,8 @@ source or bytecode files. """ + if pathname.startswith(self.archive): + pathname = pathname[len(self.archive)+1:] # Cover path separator. with contextlib.closing(zipfile.ZipFile(self.archive)) as zip_: try: return zip_.open(pathname, 'r').read()

1 0

r58724 - in sandbox/trunk/import_in_py: Py3K Py3K/tests tests zipimport_
by brett.cannon Oct. 31, 2007

Oct. 31, 2007

Author: brett.cannon Date: Wed Oct 31 04:31:22 2007 New Revision: 58724 Modified: sandbox/trunk/import_in_py/ (props changed) sandbox/trunk/import_in_py/Py3K/ (props changed) sandbox/trunk/import_in_py/Py3K/tests/ (props changed) sandbox/trunk/import_in_py/tests/ (props changed) sandbox/trunk/import_in_py/zipimport_/ (props changed) Log: Ignore .pyc and .pyo files.

1 0

r58723 - sandbox/trunk/import_in_py/zipimport_/tests.py sandbox/trunk/import_in_py/zipimport_/zipimport.py
by brett.cannon Oct. 31, 2007

Oct. 31, 2007

Author: brett.cannon Date: Wed Oct 31 04:25:30 2007 New Revision: 58723 Modified: sandbox/trunk/import_in_py/zipimport_/tests.py sandbox/trunk/import_in_py/zipimport_/zipimport.py Log: Return None for zipimporter.get_source() when bytecode exists but no source. Modified: sandbox/trunk/import_in_py/zipimport_/tests.py ============================================================================== --- sandbox/trunk/import_in_py/zipimport_/tests.py (original) +++ sandbox/trunk/import_in_py/zipimport_/tests.py Wed Oct 31 04:25:30 2007 @@ -199,12 +199,24 @@ importer.find_module('_top_level') self.assertEqual(example_code, importer.get_source('_top_level')) + def test_no_top_level_source(self): + with temp_zipfile(source=False) as zip_path: + importer = zipimport.zipimporter(zip_path) + importer.find_module('_top_level') + self.assertEqual(importer.get_source('_top_level'), None) + def test_pkg_source(self): with temp_zipfile(bytecode=False) as zip_path: importer = zipimport.zipimporter(zip_path) importer.find_module('_pkg') self.assertEqual(example_code, importer.get_source('_pkg')) + def test_no_pkg_source(self): + with temp_zipfile(source=False) as zip_path: + importer = zipimport.zipimporter(zip_path) + importer.find_module('_pkg') + self.assertEqual(importer.get_source('_pkg'), None) + class GetCode(unittest.TestCase): Modified: sandbox/trunk/import_in_py/zipimport_/zipimport.py ============================================================================== --- sandbox/trunk/import_in_py/zipimport_/zipimport.py (original) +++ sandbox/trunk/import_in_py/zipimport_/zipimport.py Wed Oct 31 04:25:30 2007 @@ -146,12 +146,18 @@ if the module does not exist, or None if only bytecode exists.""" tail = fullname.rpartition('.')[2] paths = self._check_paths(tail, '__init__') - if paths and paths[0]: - source_path = paths[0] + if paths: + if paths[0]: + source_path = paths[0] + else: + return None else: paths = self._check_paths(tail) - if paths and paths[0]: - source_path = paths[0] + if paths: + if paths[0]: + source_path = paths[0] + else: + return None else: raise ZipImportError("%s is not known" % fullname) with contextlib.closing(zipfile.ZipFile(self.archive)) as zip_:

1 0

r58722 - sandbox/trunk/import_in_py/_importlib.py
by brett.cannon Oct. 31, 2007

Oct. 31, 2007

Author: brett.cannon Date: Wed Oct 31 04:24:45 2007 New Revision: 58722 Modified: sandbox/trunk/import_in_py/_importlib.py Log: Minor comment change. Modified: sandbox/trunk/import_in_py/_importlib.py ============================================================================== --- sandbox/trunk/import_in_py/_importlib.py (original) +++ sandbox/trunk/import_in_py/_importlib.py Wed Oct 31 04:24:45 2007 @@ -393,7 +393,7 @@ # it is known whether a module should be treated as a path or package to # minimize stat calls. Could even go as far as to stat the directory the # importer is in to detect changes and then cache all the info about what - # files were found (if stating directories is platform-dependent). + # files were found (if stat'ing directories is platform-dependent). """Load a Python source or bytecode file."""

1 0

Python Regression Test Failures refleak (1)
by Neal Norwitz Oct. 30, 2007

Oct. 30, 2007

test_cmd_line leaked [46, -46, 46] references, sum=46 test_urllib2_localnet leaked [3, 3, 3] references, sum=9 test_cmd_line leaked [46, -46, 46] references, sum=46 test_popen2 leaked [26, -26, 52] references, sum=52 test_poplib leaked [-88, 0, 95] references, sum=7 test_urllib2_localnet leaked [3, 3, 3] references, sum=9

1 0

buildbot failure in amd64 XP 3.0
by buildbot＠python.org Oct. 30, 2007

Oct. 30, 2007

The Buildbot has detected a new failure of amd64 XP 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/amd64%20XP%203.0/builds/188 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: heller-windows-amd64 Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: georg.brandl BUILD FAILED: failed compile sincerely, -The Buildbot

1 0

r58716 - python/trunk/Doc/tutorial/controlflow.rst
by georg.brandl Oct. 30, 2007

Oct. 30, 2007

Author: georg.brandl Date: Tue Oct 30 18:57:12 2007 New Revision: 58716 Modified: python/trunk/Doc/tutorial/controlflow.rst Log: Make example about hiding None return values at the prompt clearer. Modified: python/trunk/Doc/tutorial/controlflow.rst ============================================================================== --- python/trunk/Doc/tutorial/controlflow.rst (original) +++ python/trunk/Doc/tutorial/controlflow.rst Tue Oct 30 18:57:12 2007 @@ -235,8 +235,9 @@ technically speaking, procedures do return a value, albeit a rather boring one. This value is called ``None`` (it's a built-in name). Writing the value ``None`` is normally suppressed by the interpreter if it would be the only value -written. You can see it if you really want to:: +written. You can see it if you really want to using :keyword:`print`:: + >>> fib(0) >>> print fib(0) None

1 0

r58715 - python/trunk/Doc/using/cmdline.rst
by georg.brandl Oct. 30, 2007

Oct. 30, 2007

Author: georg.brandl Date: Tue Oct 30 18:51:18 2007 New Revision: 58715 Modified: python/trunk/Doc/using/cmdline.rst Log: Use correct markup. Modified: python/trunk/Doc/using/cmdline.rst ============================================================================== --- python/trunk/Doc/using/cmdline.rst (original) +++ python/trunk/Doc/using/cmdline.rst Tue Oct 30 18:51:18 2007 @@ -217,10 +217,10 @@ Force stdin, stdout and stderr to be totally unbuffered. On systems where it matters, also put stdin, stdout and stderr in binary mode. - Note that there is internal buffering in :func:`file.readlines` and + Note that there is internal buffering in :meth:`file.readlines` and :ref:`bltin-file-objects` (``for line in sys.stdin``) which is not influenced by this option. To work around this, you will want to use - :func:`file.readline` inside a ``while 1:`` loop. + :meth:`file.readline` inside a ``while 1:`` loop. See also :envvar:`PYTHONUNBUFFERED`.

1 0

buildbot failure in x86 mvlgcc 3.0
by buildbot＠python.org Oct. 30, 2007

Oct. 30, 2007

The Buildbot has detected a new failure of x86 mvlgcc 3.0. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20mvlgcc%203.0/builds/223 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: loewis-linux Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: guido.van.rossum BUILD FAILED: failed configure sincerely, -The Buildbot

1 0

r58712 - python/branches/ctypes-branch/setup.py
by thomas.heller Oct. 30, 2007

Oct. 30, 2007

Author: thomas.heller Date: Tue Oct 30 18:29:16 2007 New Revision: 58712 Modified: python/branches/ctypes-branch/setup.py Log: Try to fix the ctypes problems by using the system libffi if one is installed. Modified: python/branches/ctypes-branch/setup.py ============================================================================== --- python/branches/ctypes-branch/setup.py (original) +++ python/branches/ctypes-branch/setup.py Tue Oct 30 18:29:16 2007 @@ -1518,8 +1518,9 @@ sources=['_ctypes/_ctypes_test.c']) self.extensions.extend([ext, ext_test]) - if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"): - return +## Use system ffi if one is found. +## if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"): +## return ffi_inc = find_file('ffi.h', [], inc_dirs) if ffi_inc is not None:

1 0