[Python-checkins] r69426 - in python/branches/py3k: Doc/library/zipimport.rst Lib/test/test_zipimport.py Misc/NEWS Modules/zipimport.c

Sun Feb 8 04:37:27 CET 2009

Author: nick.coghlan
Date: Sun Feb 8 04:37:27 2009
New Revision: 69426
Log:
Merged revisions 69425 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r69425 | nick.coghlan | 2009年02月08日 13:17:00 +1000 (2009年2月08日) | 1 line
 
 Issue #4512 closeout: Make ZipImport.get_filename() a public method
........
Modified:
 python/branches/py3k/ (props changed)
 python/branches/py3k/Doc/library/zipimport.rst
 python/branches/py3k/Lib/test/test_zipimport.py
 python/branches/py3k/Misc/NEWS
 python/branches/py3k/Modules/zipimport.c
Modified: python/branches/py3k/Doc/library/zipimport.rst
==============================================================================

--- python/branches/py3k/Doc/library/zipimport.rst	(original)
+++ python/branches/py3k/Doc/library/zipimport.rst	Sun Feb 8 04:37:27 2009
@@ -88,6 +88,15 @@
 file wasn't found.
 
 
+ .. method:: get_filename(fullname)
+
+ Return the value ``__file__`` would be set to if the specified module
+ was imported. Raise :exc:`ZipImportError` if the module couldn't be
+ found.
+
+ .. versionadded:: 3.1
+
+
 .. method:: get_source(fullname)
 
 Return the source code for the specified module. Raise
Modified: python/branches/py3k/Lib/test/test_zipimport.py
==============================================================================
--- python/branches/py3k/Lib/test/test_zipimport.py	(original)
+++ python/branches/py3k/Lib/test/test_zipimport.py	Sun Feb 8 04:37:27 2009
@@ -212,7 +212,7 @@
 self.assertEquals(zi.archive, TEMP_ZIP)
 self.assertEquals(zi.is_package(TESTPACK), True)
 mod = zi.load_module(TESTPACK)
- self.assertEquals(zi._get_filename(TESTPACK), mod.__file__)
+ self.assertEquals(zi.get_filename(TESTPACK), mod.__file__)
 
 self.assertEquals(zi.is_package(packdir + '__init__'), False)
 self.assertEquals(zi.is_package(packdir + TESTPACK2), True)
@@ -224,11 +224,11 @@
 mod = sys.modules[mod_name]
 self.assertEquals(zi.get_source(TESTPACK), None)
 self.assertEquals(zi.get_source(mod_path), None)
- self.assertEquals(zi._get_filename(mod_path), mod.__file__)
+ self.assertEquals(zi.get_filename(mod_path), mod.__file__)
 # To pass in the module name instead of the path, we must use the right importer
 loader = mod.__loader__
 self.assertEquals(loader.get_source(mod_name), None)
- self.assertEquals(loader._get_filename(mod_name), mod.__file__)
+ self.assertEquals(loader.get_filename(mod_name), mod.__file__)
 
 # test prefix and archivepath members
 zi2 = zipimport.zipimporter(TEMP_ZIP + os.sep + TESTPACK)
@@ -257,7 +257,7 @@
 self.assertEquals(zi.prefix, packdir)
 self.assertEquals(zi.is_package(TESTPACK2), True)
 mod = zi.load_module(TESTPACK2)
- self.assertEquals(zi._get_filename(TESTPACK2), mod.__file__)
+ self.assertEquals(zi.get_filename(TESTPACK2), mod.__file__)
 
 self.assertEquals(zi.is_package(TESTPACK2 + os.sep + '__init__'), False)
 self.assertEquals(zi.is_package(TESTPACK2 + os.sep + TESTMOD), False)
@@ -268,11 +268,11 @@
 mod = sys.modules[mod_name]
 self.assertEquals(zi.get_source(TESTPACK2), None)
 self.assertEquals(zi.get_source(mod_path), None)
- self.assertEquals(zi._get_filename(mod_path), mod.__file__)
+ self.assertEquals(zi.get_filename(mod_path), mod.__file__)
 # To pass in the module name instead of the path, we must use the right importer
 loader = mod.__loader__
 self.assertEquals(loader.get_source(mod_name), None)
- self.assertEquals(loader._get_filename(mod_name), mod.__file__)
+ self.assertEquals(loader.get_filename(mod_name), mod.__file__)
 finally:
 z.close()
 os.remove(TEMP_ZIP)
Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sun Feb 8 04:37:27 2009
@@ -155,6 +155,9 @@
 Library
 -------
 
+- Issue #4512 (part 2): Promote ``ZipImporter._get_filename()`` to be a
+ public documented method ``ZipImporter.get_filename()``.
+
 - Issue #4195: The ``runpy`` module (and the ``-m`` switch) now support
 the execution of packages by looking for and executing a ``__main__``
 submodule when a package name is supplied. Initial patch by Andi
Modified: python/branches/py3k/Modules/zipimport.c
==============================================================================
--- python/branches/py3k/Modules/zipimport.c	(original)
+++ python/branches/py3k/Modules/zipimport.c	Sun Feb 8 04:37:27 2009
@@ -363,7 +363,7 @@
 char *fullname, *modpath;
 int ispackage;
 
- if (!PyArg_ParseTuple(args, "s:zipimporter._get_filename",
+ if (!PyArg_ParseTuple(args, "s:zipimporter.get_filename",
 &fullname))
 return NULL;
 
@@ -543,7 +543,7 @@
 
 
 PyDoc_STRVAR(doc_get_filename,
-"_get_filename(fullname) -> filename string.\n\
+"get_filename(fullname) -> filename string.\n\
 \n\
 Return the filename for the specified module.");
 
@@ -558,7 +558,7 @@
 	 doc_get_code},
 	{"get_source", zipimporter_get_source, METH_VARARGS,
 	 doc_get_source},
-	{"_get_filename", zipimporter_get_filename, METH_VARARGS,
+	{"get_filename", zipimporter_get_filename, METH_VARARGS,
 	 doc_get_filename},
 	{"is_package", zipimporter_is_package, METH_VARARGS,
 	 doc_is_package},
