mirror of https://github.com/python/cpython
merge
This commit is contained in:
commit
a05a503342
|
@ -240,7 +240,7 @@ class BuiltinImporter:
|
|||
@classmethod
|
||||
@_requires_builtin
|
||||
def is_package(cls, fullname):
|
||||
"""Return None as built-in module are never packages."""
|
||||
"""Return None as built-in modules are never packages."""
|
||||
return False
|
||||
|
||||
|
||||
|
@ -765,7 +765,7 @@ def _gcd_import(name, package=None, level=0):
|
|||
being made from, and the level adjustment.
|
||||
|
||||
This function represents the greatest common denominator of functionality
|
||||
between import_module and __import__. This includes settting __package__ if
|
||||
between import_module and __import__. This includes setting __package__ if
|
||||
the loader did not.
|
||||
|
||||
"""
|
||||
|
@ -855,7 +855,7 @@ def __import__(name, globals={}, locals={}, fromlist=[], level=0):
|
|||
module = _gcd_import(name)
|
||||
else:
|
||||
# __package__ is not guaranteed to be defined or could be set to None
|
||||
# to represent that it's proper value is unknown
|
||||
# to represent that its proper value is unknown
|
||||
package = globals.get('__package__')
|
||||
if package is None:
|
||||
package = globals['__name__']
|
||||
|
|
|
@ -489,6 +489,7 @@ class TestsWithSourceFile(unittest.TestCase):
|
|||
except zipfile.BadZipFile:
|
||||
self.assertTrue(zipfp2.fp is None, 'zipfp is not closed')
|
||||
|
||||
@skipUnless(zlib, "requires zlib")
|
||||
def test_unicode_filenames(self):
|
||||
# bug #10801
|
||||
fname = findfile('zip_cp437_header.zip')
|
||||
|
|
Loading…
Reference in New Issue