diff -r f903cf864191 Lib/test/test_zipimport.py
--- a/Lib/test/test_zipimport.py	Thu Apr 18 19:37:06 2013 +0200
+++ b/Lib/test/test_zipimport.py	Thu Apr 18 22:06:05 2013 +0100
@@ -184,6 +184,15 @@
 packdir2 + TESTMOD + pyc_ext: (NOW, test_pyc)}
 self.doTest(pyc_ext, files, TESTPACK, TESTPACK2, TESTMOD)
 
+ def testDeepNamespacePackage(self):
+ packdir = TESTPACK + os.sep
+ packdir2 = packdir + TESTPACK2 + os.sep
+ # The first two files are just directory entries (so have no data).
+ files = {packdir: (NOW, ""),
+ packdir2: (NOW, ""),
+ packdir2 + TESTMOD + pyc_ext: (NOW, test_pyc)}
+ self.doTest(pyc_ext, files, TESTPACK, TESTPACK2, TESTMOD)
+
 def testZipImporterMethods(self):
 packdir = TESTPACK + os.sep
 packdir2 = packdir + TESTPACK2 + os.sep
diff -r f903cf864191 Modules/zipimport.c
--- a/Modules/zipimport.c	Thu Apr 18 19:37:06 2013 +0200
+++ b/Modules/zipimport.c	Thu Apr 18 22:06:05 2013 +0100
@@ -349,21 +349,34 @@
 if (mi == MI_NOT_FOUND) {
 /* Not a module or regular package. See if this is a directory, and
 therefore possibly a portion of a namespace package. */
- int is_dir = check_is_directory(self, self->prefix, fullname);
+ find_loader_result result = FL_NOT_FOUND;
+ PyObject *subname;
+ int is_dir;
+
+ /* We're only interested in the last path component of fullname;
+ earlier components are recorded in self->prefix. */
+ subname = get_subname(fullname);
+ if (subname == NULL) {
+ return -1;
+ }
+
+ is_dir = check_is_directory(self, self->prefix, subname);
 if (is_dir < 0) - return -1; - if (is_dir) { + result = -1; + else if (is_dir) { /* This is possibly a portion of a namespace package. Return the string representing its path, without a trailing separator. */ *namespace_portion = PyUnicode_FromFormat("%U%c%U%U", self->archive, SEP,
- self->prefix, fullname);
+ self->prefix, subname);
 if (*namespace_portion == NULL)
- return FL_ERROR;
- return FL_NS_FOUND;
+ result = FL_ERROR;
+ else
+ result = FL_NS_FOUND;
 }
- return FL_NOT_FOUND;
+ Py_DECREF(subname);
+ return result;
 }
 /* This is a module or package. */
 return FL_MODULE_FOUND;
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://bugs.python.org/file29927/issue17633-2.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://bugs.python.org/file29927/issue17633-2.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>