2002-12-30 18:08:05 -04:00
|
|
|
import sys
|
|
|
|
import os
|
|
|
|
import marshal
|
2016-01-15 15:22:19 -04:00
|
|
|
import importlib
|
2013-06-15 18:11:25 -03:00
|
|
|
import importlib.util
|
2002-12-30 18:08:05 -04:00
|
|
|
import struct
|
|
|
|
import time
|
2006-01-23 03:52:13 -04:00
|
|
|
import unittest
|
2002-12-30 18:08:05 -04:00
|
|
|
|
2008-05-20 18:35:26 -03:00
|
|
|
from test import support
|
2002-12-30 18:08:05 -04:00
|
|
|
|
2009-09-12 15:41:20 -03:00
|
|
|
from zipfile import ZipFile, ZipInfo, ZIP_STORED, ZIP_DEFLATED
|
|
|
|
|
2002-12-30 18:08:05 -04:00
|
|
|
import zipimport
|
2006-04-21 07:40:58 -03:00
|
|
|
import linecache
|
|
|
|
import doctest
|
|
|
|
import inspect
|
2007-08-08 22:03:29 -03:00
|
|
|
import io
|
2006-04-21 07:40:58 -03:00
|
|
|
from traceback import extract_tb, extract_stack, print_tb
|
2013-06-12 16:57:01 -03:00
|
|
|
|
|
|
|
test_src = """\
|
|
|
|
def get_name():
|
|
|
|
return __name__
|
|
|
|
def get_file():
|
|
|
|
return __file__
|
|
|
|
"""
|
|
|
|
test_co = compile(test_src, "<???>", "exec")
|
2006-04-21 07:40:58 -03:00
|
|
|
raise_src = 'def do_raise(): raise TypeError\n'
|
2002-12-30 18:08:05 -04:00
|
|
|
|
2012-01-13 13:52:16 -04:00
|
|
|
def make_pyc(co, mtime, size):
|
2002-12-30 18:08:05 -04:00
|
|
|
data = marshal.dumps(co)
|
2003-01-08 12:37:03 -04:00
|
|
|
if type(mtime) is type(0.0):
|
2003-02-18 22:35:07 -04:00
|
|
|
# Mac mtimes need a bit of special casing
|
|
|
|
if mtime < 0x7fffffff:
|
|
|
|
mtime = int(mtime)
|
|
|
|
else:
|
2007-01-15 12:59:06 -04:00
|
|
|
mtime = int(-0x100000000 + int(mtime))
|
2013-06-15 18:11:25 -03:00
|
|
|
pyc = (importlib.util.MAGIC_NUMBER +
|
|
|
|
struct.pack("<ii", int(mtime), size & 0xFFFFFFFF) + data)
|
2002-12-30 18:08:05 -04:00
|
|
|
return pyc
|
|
|
|
|
2006-01-23 18:19:24 -04:00
|
|
|
def module_path_to_dotted_name(path):
|
|
|
|
return path.replace(os.sep, '.')
|
|
|
|
|
2002-12-30 18:08:05 -04:00
|
|
|
NOW = time.time()
|
2012-01-13 13:52:16 -04:00
|
|
|
test_pyc = make_pyc(test_co, NOW, len(test_src))
|
2002-12-30 18:08:05 -04:00
|
|
|
|
|
|
|
|
|
|
|
TESTMOD = "ziptestmodule"
|
|
|
|
TESTPACK = "ziptestpackage"
|
2003-01-02 08:55:48 -04:00
|
|
|
TESTPACK2 = "ziptestpackage2"
|
2016-01-15 15:22:19 -04:00
|
|
|
TEMP_DIR = os.path.abspath("junk95142")
|
2007-08-16 11:35:24 -03:00
|
|
|
TEMP_ZIP = os.path.abspath("junk95142.zip")
|
2002-12-30 18:08:05 -04:00
|
|
|
|
2013-06-15 18:11:25 -03:00
|
|
|
pyc_file = importlib.util.cache_from_source(TESTMOD + '.py')
|
2015-04-13 15:21:02 -03:00
|
|
|
pyc_ext = '.pyc'
|
2010-04-16 21:19:56 -03:00
|
|
|
|
2009-09-12 15:41:20 -03:00
|
|
|
|
2013-06-12 16:57:01 -03:00
|
|
|
class ImportHooksBaseTestCase(unittest.TestCase):
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
self.path = sys.path[:]
|
|
|
|
self.meta_path = sys.meta_path[:]
|
|
|
|
self.path_hooks = sys.path_hooks[:]
|
|
|
|
sys.path_importer_cache.clear()
|
|
|
|
self.modules_before = support.modules_setup()
|
|
|
|
|
|
|
|
def tearDown(self):
|
|
|
|
sys.path[:] = self.path
|
|
|
|
sys.meta_path[:] = self.meta_path
|
|
|
|
sys.path_hooks[:] = self.path_hooks
|
|
|
|
sys.path_importer_cache.clear()
|
|
|
|
support.modules_cleanup(*self.modules_before)
|
|
|
|
|
|
|
|
|
2002-12-30 18:08:05 -04:00
|
|
|
class UncompressedZipImportTestCase(ImportHooksBaseTestCase):
|
|
|
|
|
|
|
|
compression = ZIP_STORED
|
|
|
|
|
|
|
|
def setUp(self):
|
|
|
|
# We're reusing the zip archive path, so we must clear the
|
2016-01-15 15:22:19 -04:00
|
|
|
# cached directory info and linecache.
|
2006-04-21 07:40:58 -03:00
|
|
|
linecache.clearcache()
|
2002-12-30 18:08:05 -04:00
|
|
|
zipimport._zip_directory_cache.clear()
|
|
|
|
ImportHooksBaseTestCase.setUp(self)
|
|
|
|
|
2016-01-15 15:22:19 -04:00
|
|
|
def makeTree(self, files, dirName=TEMP_DIR):
|
|
|
|
# Create a filesystem based set of modules/packages
|
|
|
|
# defined by files under the directory dirName.
|
|
|
|
self.addCleanup(support.rmtree, dirName)
|
|
|
|
|
|
|
|
for name, (mtime, data) in files.items():
|
|
|
|
path = os.path.join(dirName, name)
|
|
|
|
if path[-1] == os.sep:
|
|
|
|
if not os.path.isdir(path):
|
|
|
|
os.makedirs(path)
|
|
|
|
else:
|
|
|
|
dname = os.path.dirname(path)
|
|
|
|
if not os.path.isdir(dname):
|
|
|
|
os.makedirs(dname)
|
|
|
|
with open(path, 'wb') as fp:
|
|
|
|
fp.write(data)
|
|
|
|
|
|
|
|
def makeZip(self, files, zipName=TEMP_ZIP, **kw):
|
|
|
|
# Create a zip archive based set of modules/packages
|
|
|
|
# defined by files in the zip file zipName. If the
|
|
|
|
# key 'stuff' exists in kw it is prepended to the archive.
|
|
|
|
self.addCleanup(support.unlink, zipName)
|
|
|
|
|
|
|
|
with ZipFile(zipName, "w") as z:
|
2014-02-16 15:12:57 -04:00
|
|
|
for name, (mtime, data) in files.items():
|
|
|
|
zinfo = ZipInfo(name, time.localtime(mtime))
|
|
|
|
zinfo.compress_type = self.compression
|
|
|
|
z.writestr(zinfo, data)
|
|
|
|
|
2016-01-15 15:22:19 -04:00
|
|
|
stuff = kw.get("stuff", None)
|
|
|
|
if stuff is not None:
|
|
|
|
# Prepend 'stuff' to the start of the zipfile
|
|
|
|
with open(zipName, "rb") as f:
|
|
|
|
data = f.read()
|
|
|
|
with open(zipName, "wb") as f:
|
|
|
|
f.write(stuff)
|
|
|
|
f.write(data)
|
|
|
|
|
|
|
|
def doTest(self, expected_ext, files, *modules, **kw):
|
|
|
|
self.makeZip(files, **kw)
|
2014-02-16 15:12:57 -04:00
|
|
|
|
2016-01-15 15:22:19 -04:00
|
|
|
sys.path.insert(0, TEMP_ZIP)
|
2002-12-30 18:08:05 -04:00
|
|
|
|
2016-01-15 15:22:19 -04:00
|
|
|
mod = importlib.import_module(".".join(modules))
|
2006-04-21 07:40:58 -03:00
|
|
|
|
2016-01-15 15:22:19 -04:00
|
|
|
call = kw.get('call')
|
|
|
|
if call is not None:
|
|
|
|
call(mod)
|
2006-04-21 07:40:58 -03:00
|
|
|
|
2016-01-15 15:22:19 -04:00
|
|
|
if expected_ext:
|
|
|
|
file = mod.get_file()
|
|
|
|
self.assertEqual(file, os.path.join(TEMP_ZIP,
|
2010-11-20 15:04:17 -04:00
|
|
|
*modules) + expected_ext)
|
2002-12-30 18:08:05 -04:00
|
|
|
|
|
|
|
def testAFakeZlib(self):
|
|
|
|
#
|
|
|
|
# This could cause a stack overflow before: importing zlib.py
|
|
|
|
# from a compressed archive would cause zlib to be imported
|
|
|
|
# which would find zlib.py in the archive, which would... etc.
|
|
|
|
#
|
|
|
|
# This test *must* be executed first: it must be the first one
|
|
|
|
# to trigger zipimport to import zlib (zipimport caches the
|
|
|
|
# zlib.decompress function object, after which the problem being
|
|
|
|
# tested here wouldn't be a problem anymore...
|
|
|
|
# (Hence the 'A' in the test method name: to make it the first
|
|
|
|
# item in a list sorted by name, like unittest.makeSuite() does.)
|
|
|
|
#
|
2003-11-18 19:00:55 -04:00
|
|
|
# This test fails on platforms on which the zlib module is
|
|
|
|
# statically linked, but the problem it tests for can't
|
|
|
|
# occur in that case (builtin modules are always found first),
|
|
|
|
# so we'll simply skip it then. Bug #765456.
|
|
|
|
#
|
|
|
|
if "zlib" in sys.builtin_module_names:
|
2013-12-08 02:20:35 -04:00
|
|
|
self.skipTest('zlib is a builtin module')
|
2002-12-30 18:08:05 -04:00
|
|
|
if "zlib" in sys.modules:
|
|
|
|
del sys.modules["zlib"]
|
|
|
|
files = {"zlib.py": (NOW, test_src)}
|
|
|
|
try:
|
|
|
|
self.doTest(".py", files, "zlib")
|
|
|
|
except ImportError:
|
|
|
|
if self.compression != ZIP_DEFLATED:
|
|
|
|
self.fail("expected test to not raise ImportError")
|
|
|
|
else:
|
|
|
|
if self.compression != ZIP_STORED:
|
|
|
|
self.fail("expected test to raise ImportError")
|
|
|
|
|
|
|
|
def testPy(self):
|
|
|
|
files = {TESTMOD + ".py": (NOW, test_src)}
|
|
|
|
self.doTest(".py", files, TESTMOD)
|
|
|
|
|
|
|
|
def testPyc(self):
|
|
|
|
files = {TESTMOD + pyc_ext: (NOW, test_pyc)}
|
|
|
|
self.doTest(pyc_ext, files, TESTMOD)
|
|
|
|
|
|
|
|
def testBoth(self):
|
|
|
|
files = {TESTMOD + ".py": (NOW, test_src),
|
|
|
|
TESTMOD + pyc_ext: (NOW, test_pyc)}
|
|
|
|
self.doTest(pyc_ext, files, TESTMOD)
|
|
|
|
|
2003-01-03 07:18:56 -04:00
|
|
|
def testEmptyPy(self):
|
|
|
|
files = {TESTMOD + ".py": (NOW, "")}
|
|
|
|
self.doTest(None, files, TESTMOD)
|
|
|
|
|
2002-12-30 18:08:05 -04:00
|
|
|
def testBadMagic(self):
|
|
|
|
# make pyc magic word invalid, forcing loading from .py
|
2007-11-21 15:29:53 -04:00
|
|
|
badmagic_pyc = bytearray(test_pyc)
|
2007-08-03 15:40:49 -03:00
|
|
|
badmagic_pyc[0] ^= 0x04 # flip an arbitrary bit
|
2002-12-30 18:08:05 -04:00
|
|
|
files = {TESTMOD + ".py": (NOW, test_src),
|
|
|
|
TESTMOD + pyc_ext: (NOW, badmagic_pyc)}
|
|
|
|
self.doTest(".py", files, TESTMOD)
|
|
|
|
|
|
|
|
def testBadMagic2(self):
|
|
|
|
# make pyc magic word invalid, causing an ImportError
|
2007-11-21 15:29:53 -04:00
|
|
|
badmagic_pyc = bytearray(test_pyc)
|
2007-08-03 15:40:49 -03:00
|
|
|
badmagic_pyc[0] ^= 0x04 # flip an arbitrary bit
|
2002-12-30 18:08:05 -04:00
|
|
|
files = {TESTMOD + pyc_ext: (NOW, badmagic_pyc)}
|
|
|
|
try:
|
|
|
|
self.doTest(".py", files, TESTMOD)
|
|
|
|
except ImportError:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.fail("expected ImportError; import from bad pyc")
|
|
|
|
|
|
|
|
def testBadMTime(self):
|
2007-11-21 15:29:53 -04:00
|
|
|
badtime_pyc = bytearray(test_pyc)
|
2010-04-16 21:19:56 -03:00
|
|
|
# flip the second bit -- not the first as that one isn't stored in the
|
|
|
|
# .py's mtime in the zip archive.
|
|
|
|
badtime_pyc[7] ^= 0x02
|
2002-12-30 18:08:05 -04:00
|
|
|
files = {TESTMOD + ".py": (NOW, test_src),
|
|
|
|
TESTMOD + pyc_ext: (NOW, badtime_pyc)}
|
|
|
|
self.doTest(".py", files, TESTMOD)
|
|
|
|
|
|
|
|
def testPackage(self):
|
|
|
|
packdir = TESTPACK + os.sep
|
|
|
|
files = {packdir + "__init__" + pyc_ext: (NOW, test_pyc),
|
|
|
|
packdir + TESTMOD + pyc_ext: (NOW, test_pyc)}
|
|
|
|
self.doTest(pyc_ext, files, TESTPACK, TESTMOD)
|
|
|
|
|
2016-01-15 15:22:19 -04:00
|
|
|
def testSubPackage(self):
|
|
|
|
# Test that subpackages function when loaded from zip
|
|
|
|
# archives.
|
2002-12-30 18:08:05 -04:00
|
|
|
packdir = TESTPACK + os.sep
|
2003-01-02 08:55:48 -04:00
|
|
|
packdir2 = packdir + TESTPACK2 + os.sep
|
2002-12-30 18:08:05 -04:00
|
|
|
files = {packdir + "__init__" + pyc_ext: (NOW, test_pyc),
|
|
|
|
packdir2 + "__init__" + pyc_ext: (NOW, test_pyc),
|
|
|
|
packdir2 + TESTMOD + pyc_ext: (NOW, test_pyc)}
|
2003-01-02 08:55:48 -04:00
|
|
|
self.doTest(pyc_ext, files, TESTPACK, TESTPACK2, TESTMOD)
|
2002-12-30 18:08:05 -04:00
|
|
|
|
2016-01-15 15:22:19 -04:00
|
|
|
def testSubNamespacePackage(self):
|
|
|
|
# Test that implicit namespace subpackages function
|
|
|
|
# when loaded from zip archives.
|
|
|
|
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 testMixedNamespacePackage(self):
|
|
|
|
# Test implicit namespace packages spread between a
|
|
|
|
# real filesystem and a zip archive.
|
|
|
|
packdir = TESTPACK + os.sep
|
|
|
|
packdir2 = packdir + TESTPACK2 + os.sep
|
|
|
|
packdir3 = packdir2 + TESTPACK + '3' + os.sep
|
|
|
|
files1 = {packdir: (NOW, ""),
|
|
|
|
packdir + TESTMOD + pyc_ext: (NOW, test_pyc),
|
|
|
|
packdir2: (NOW, ""),
|
|
|
|
packdir3: (NOW, ""),
|
|
|
|
packdir3 + TESTMOD + pyc_ext: (NOW, test_pyc),
|
|
|
|
packdir2 + TESTMOD + '3' + pyc_ext: (NOW, test_pyc),
|
|
|
|
packdir2 + TESTMOD + pyc_ext: (NOW, test_pyc)}
|
|
|
|
files2 = {packdir: (NOW, ""),
|
|
|
|
packdir + TESTMOD + '2' + pyc_ext: (NOW, test_pyc),
|
|
|
|
packdir2: (NOW, ""),
|
|
|
|
packdir2 + TESTMOD + '2' + pyc_ext: (NOW, test_pyc),
|
|
|
|
packdir2 + TESTMOD + pyc_ext: (NOW, test_pyc)}
|
|
|
|
|
|
|
|
zip1 = os.path.abspath("path1.zip")
|
|
|
|
self.makeZip(files1, zip1)
|
|
|
|
|
|
|
|
zip2 = TEMP_DIR
|
|
|
|
self.makeTree(files2, zip2)
|
|
|
|
|
|
|
|
# zip2 should override zip1.
|
|
|
|
sys.path.insert(0, zip1)
|
|
|
|
sys.path.insert(0, zip2)
|
|
|
|
|
|
|
|
mod = importlib.import_module(TESTPACK)
|
|
|
|
|
|
|
|
# if TESTPACK is functioning as a namespace pkg then
|
|
|
|
# there should be two entries in the __path__.
|
|
|
|
# First should be path2 and second path1.
|
|
|
|
self.assertEqual(2, len(mod.__path__))
|
|
|
|
p1, p2 = mod.__path__
|
|
|
|
self.assertEqual(os.path.basename(TEMP_DIR), p1.split(os.sep)[-2])
|
|
|
|
self.assertEqual("path1.zip", p2.split(os.sep)[-2])
|
|
|
|
|
|
|
|
# packdir3 should import as a namespace package.
|
|
|
|
# Its __path__ is an iterable of 1 element from zip1.
|
|
|
|
mod = importlib.import_module(packdir3.replace(os.sep, '.')[:-1])
|
|
|
|
self.assertEqual(1, len(mod.__path__))
|
|
|
|
mpath = list(mod.__path__)[0].split('path1.zip' + os.sep)[1]
|
|
|
|
self.assertEqual(packdir3[:-1], mpath)
|
|
|
|
|
|
|
|
# TESTPACK/TESTMOD only exists in path1.
|
|
|
|
mod = importlib.import_module('.'.join((TESTPACK, TESTMOD)))
|
|
|
|
self.assertEqual("path1.zip", mod.__file__.split(os.sep)[-3])
|
|
|
|
|
|
|
|
# And TESTPACK/(TESTMOD + '2') only exists in path2.
|
|
|
|
mod = importlib.import_module('.'.join((TESTPACK, TESTMOD + '2')))
|
|
|
|
self.assertEqual(os.path.basename(TEMP_DIR),
|
|
|
|
mod.__file__.split(os.sep)[-3])
|
|
|
|
|
|
|
|
# One level deeper...
|
|
|
|
subpkg = '.'.join((TESTPACK, TESTPACK2))
|
|
|
|
mod = importlib.import_module(subpkg)
|
|
|
|
self.assertEqual(2, len(mod.__path__))
|
|
|
|
p1, p2 = mod.__path__
|
|
|
|
self.assertEqual(os.path.basename(TEMP_DIR), p1.split(os.sep)[-3])
|
|
|
|
self.assertEqual("path1.zip", p2.split(os.sep)[-3])
|
|
|
|
|
|
|
|
# subpkg.TESTMOD exists in both zips should load from zip2.
|
|
|
|
mod = importlib.import_module('.'.join((subpkg, TESTMOD)))
|
|
|
|
self.assertEqual(os.path.basename(TEMP_DIR),
|
|
|
|
mod.__file__.split(os.sep)[-4])
|
|
|
|
|
|
|
|
# subpkg.TESTMOD + '2' only exists in zip2.
|
|
|
|
mod = importlib.import_module('.'.join((subpkg, TESTMOD + '2')))
|
|
|
|
self.assertEqual(os.path.basename(TEMP_DIR),
|
|
|
|
mod.__file__.split(os.sep)[-4])
|
|
|
|
|
|
|
|
# Finally subpkg.TESTMOD + '3' only exists in zip1.
|
|
|
|
mod = importlib.import_module('.'.join((subpkg, TESTMOD + '3')))
|
|
|
|
self.assertEqual('path1.zip', mod.__file__.split(os.sep)[-4])
|
|
|
|
|
|
|
|
def testNamespacePackage(self):
|
|
|
|
# Test implicit namespace packages spread between multiple zip
|
|
|
|
# archives.
|
|
|
|
packdir = TESTPACK + os.sep
|
|
|
|
packdir2 = packdir + TESTPACK2 + os.sep
|
|
|
|
packdir3 = packdir2 + TESTPACK + '3' + os.sep
|
|
|
|
files1 = {packdir: (NOW, ""),
|
|
|
|
packdir + TESTMOD + pyc_ext: (NOW, test_pyc),
|
|
|
|
packdir2: (NOW, ""),
|
|
|
|
packdir3: (NOW, ""),
|
|
|
|
packdir3 + TESTMOD + pyc_ext: (NOW, test_pyc),
|
|
|
|
packdir2 + TESTMOD + '3' + pyc_ext: (NOW, test_pyc),
|
|
|
|
packdir2 + TESTMOD + pyc_ext: (NOW, test_pyc)}
|
|
|
|
zip1 = os.path.abspath("path1.zip")
|
|
|
|
self.makeZip(files1, zip1)
|
|
|
|
|
|
|
|
files2 = {packdir: (NOW, ""),
|
|
|
|
packdir + TESTMOD + '2' + pyc_ext: (NOW, test_pyc),
|
|
|
|
packdir2: (NOW, ""),
|
|
|
|
packdir2 + TESTMOD + '2' + pyc_ext: (NOW, test_pyc),
|
|
|
|
packdir2 + TESTMOD + pyc_ext: (NOW, test_pyc)}
|
|
|
|
zip2 = os.path.abspath("path2.zip")
|
|
|
|
self.makeZip(files2, zip2)
|
|
|
|
|
|
|
|
# zip2 should override zip1.
|
|
|
|
sys.path.insert(0, zip1)
|
|
|
|
sys.path.insert(0, zip2)
|
|
|
|
|
|
|
|
mod = importlib.import_module(TESTPACK)
|
|
|
|
|
|
|
|
# if TESTPACK is functioning as a namespace pkg then
|
|
|
|
# there should be two entries in the __path__.
|
|
|
|
# First should be path2 and second path1.
|
|
|
|
self.assertEqual(2, len(mod.__path__))
|
|
|
|
p1, p2 = mod.__path__
|
|
|
|
self.assertEqual("path2.zip", p1.split(os.sep)[-2])
|
|
|
|
self.assertEqual("path1.zip", p2.split(os.sep)[-2])
|
|
|
|
|
|
|
|
# packdir3 should import as a namespace package.
|
|
|
|
# Tts __path__ is an iterable of 1 element from zip1.
|
|
|
|
mod = importlib.import_module(packdir3.replace(os.sep, '.')[:-1])
|
|
|
|
self.assertEqual(1, len(mod.__path__))
|
|
|
|
mpath = list(mod.__path__)[0].split('path1.zip' + os.sep)[1]
|
|
|
|
self.assertEqual(packdir3[:-1], mpath)
|
|
|
|
|
|
|
|
# TESTPACK/TESTMOD only exists in path1.
|
|
|
|
mod = importlib.import_module('.'.join((TESTPACK, TESTMOD)))
|
|
|
|
self.assertEqual("path1.zip", mod.__file__.split(os.sep)[-3])
|
|
|
|
|
|
|
|
# And TESTPACK/(TESTMOD + '2') only exists in path2.
|
|
|
|
mod = importlib.import_module('.'.join((TESTPACK, TESTMOD + '2')))
|
|
|
|
self.assertEqual("path2.zip", mod.__file__.split(os.sep)[-3])
|
|
|
|
|
|
|
|
# One level deeper...
|
|
|
|
subpkg = '.'.join((TESTPACK, TESTPACK2))
|
|
|
|
mod = importlib.import_module(subpkg)
|
|
|
|
self.assertEqual(2, len(mod.__path__))
|
|
|
|
p1, p2 = mod.__path__
|
|
|
|
self.assertEqual("path2.zip", p1.split(os.sep)[-3])
|
|
|
|
self.assertEqual("path1.zip", p2.split(os.sep)[-3])
|
|
|
|
|
|
|
|
# subpkg.TESTMOD exists in both zips should load from zip2.
|
|
|
|
mod = importlib.import_module('.'.join((subpkg, TESTMOD)))
|
|
|
|
self.assertEqual('path2.zip', mod.__file__.split(os.sep)[-4])
|
|
|
|
|
|
|
|
# subpkg.TESTMOD + '2' only exists in zip2.
|
|
|
|
mod = importlib.import_module('.'.join((subpkg, TESTMOD + '2')))
|
|
|
|
self.assertEqual('path2.zip', mod.__file__.split(os.sep)[-4])
|
|
|
|
|
|
|
|
# Finally subpkg.TESTMOD + '3' only exists in zip1.
|
|
|
|
mod = importlib.import_module('.'.join((subpkg, TESTMOD + '3')))
|
|
|
|
self.assertEqual('path1.zip', mod.__file__.split(os.sep)[-4])
|
|
|
|
|
2006-01-23 03:52:13 -04:00
|
|
|
def testZipImporterMethods(self):
|
|
|
|
packdir = TESTPACK + os.sep
|
|
|
|
packdir2 = packdir + TESTPACK2 + os.sep
|
|
|
|
files = {packdir + "__init__" + pyc_ext: (NOW, test_pyc),
|
|
|
|
packdir2 + "__init__" + pyc_ext: (NOW, test_pyc),
|
2015-07-22 11:57:56 -03:00
|
|
|
packdir2 + TESTMOD + pyc_ext: (NOW, test_pyc),
|
|
|
|
"spam" + pyc_ext: (NOW, test_pyc)}
|
2006-01-23 03:52:13 -04:00
|
|
|
|
|
|
|
z = ZipFile(TEMP_ZIP, "w")
|
|
|
|
try:
|
|
|
|
for name, (mtime, data) in files.items():
|
|
|
|
zinfo = ZipInfo(name, time.localtime(mtime))
|
|
|
|
zinfo.compress_type = self.compression
|
2013-02-16 11:43:45 -04:00
|
|
|
zinfo.comment = b"spam"
|
2006-01-23 03:52:13 -04:00
|
|
|
z.writestr(zinfo, data)
|
|
|
|
z.close()
|
|
|
|
|
|
|
|
zi = zipimport.zipimporter(TEMP_ZIP)
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(zi.archive, TEMP_ZIP)
|
|
|
|
self.assertEqual(zi.is_package(TESTPACK), True)
|
2015-07-22 11:57:56 -03:00
|
|
|
|
|
|
|
find_mod = zi.find_module('spam')
|
|
|
|
self.assertIsNotNone(find_mod)
|
|
|
|
self.assertIsInstance(find_mod, zipimport.zipimporter)
|
|
|
|
self.assertFalse(find_mod.is_package('spam'))
|
|
|
|
load_mod = find_mod.load_module('spam')
|
|
|
|
self.assertEqual(find_mod.get_filename('spam'), load_mod.__file__)
|
|
|
|
|
2008-12-14 07:50:48 -04:00
|
|
|
mod = zi.load_module(TESTPACK)
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(zi.get_filename(TESTPACK), mod.__file__)
|
2006-01-23 17:28:42 -04:00
|
|
|
|
2016-01-15 15:22:19 -04:00
|
|
|
existing_pack_path = importlib.import_module(TESTPACK).__path__[0]
|
2012-03-12 22:16:33 -03:00
|
|
|
expected_path_path = os.path.join(TEMP_ZIP, TESTPACK)
|
|
|
|
self.assertEqual(existing_pack_path, expected_path_path)
|
|
|
|
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(zi.is_package(packdir + '__init__'), False)
|
|
|
|
self.assertEqual(zi.is_package(packdir + TESTPACK2), True)
|
|
|
|
self.assertEqual(zi.is_package(packdir2 + TESTMOD), False)
|
2006-01-23 03:52:13 -04:00
|
|
|
|
2008-12-14 07:50:48 -04:00
|
|
|
mod_path = packdir2 + TESTMOD
|
|
|
|
mod_name = module_path_to_dotted_name(mod_path)
|
2016-01-15 15:22:19 -04:00
|
|
|
mod = importlib.import_module(mod_name)
|
|
|
|
self.assertTrue(mod_name in sys.modules)
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(zi.get_source(TESTPACK), None)
|
|
|
|
self.assertEqual(zi.get_source(mod_path), None)
|
|
|
|
self.assertEqual(zi.get_filename(mod_path), mod.__file__)
|
2010-04-16 21:19:56 -03:00
|
|
|
# To pass in the module name instead of the path, we must use the
|
|
|
|
# right importer
|
2008-12-14 07:50:48 -04:00
|
|
|
loader = mod.__loader__
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(loader.get_source(mod_name), None)
|
|
|
|
self.assertEqual(loader.get_filename(mod_name), mod.__file__)
|
Merged revisions 59774-59783 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59774 | georg.brandl | 2008-01-06 16:41:50 +0100 (Sun, 06 Jan 2008) | 2 lines
#1501: document that 0**0 == 1.
........
r59775 | georg.brandl | 2008-01-06 16:48:20 +0100 (Sun, 06 Jan 2008) | 2 lines
#759525: document that dir() doesn't return metaclass attrs when given a class as arg.
........
r59776 | georg.brandl | 2008-01-06 16:55:26 +0100 (Sun, 06 Jan 2008) | 2 lines
#1615275: clarify return object types of different tempfile factories.
........
r59777 | georg.brandl | 2008-01-06 17:01:26 +0100 (Sun, 06 Jan 2008) | 2 lines
#1727024: document that Popen.returncode is set by Popen.poll/wait.
........
r59778 | georg.brandl | 2008-01-06 17:04:56 +0100 (Sun, 06 Jan 2008) | 2 lines
#1686390: add example for csv.Sniffer use.
........
r59779 | georg.brandl | 2008-01-06 17:12:39 +0100 (Sun, 06 Jan 2008) | 2 lines
#1559684: document that shutil.copy* doesn't copy all metadata on Posix and Windows too.
........
r59780 | georg.brandl | 2008-01-06 17:17:56 +0100 (Sun, 06 Jan 2008) | 2 lines
#1582: document __reversed__, patch by Mark Russell.
........
r59781 | georg.brandl | 2008-01-06 17:22:56 +0100 (Sun, 06 Jan 2008) | 2 lines
#1499: Document compile() exceptions.
........
r59782 | georg.brandl | 2008-01-06 17:49:50 +0100 (Sun, 06 Jan 2008) | 2 lines
#1325: Add docs and tests for zipimporter.archive and zipimporter.prefix.
........
2008-01-06 13:05:40 -04:00
|
|
|
|
|
|
|
# test prefix and archivepath members
|
|
|
|
zi2 = zipimport.zipimporter(TEMP_ZIP + os.sep + TESTPACK)
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(zi2.archive, TEMP_ZIP)
|
|
|
|
self.assertEqual(zi2.prefix, TESTPACK + os.sep)
|
2006-01-23 03:52:13 -04:00
|
|
|
finally:
|
|
|
|
z.close()
|
|
|
|
os.remove(TEMP_ZIP)
|
|
|
|
|
Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63066 | georg.brandl | 2008-05-11 10:56:04 -0400 (Sun, 11 May 2008) | 2 lines
#2709 followup: better description of Tk's pros and cons.
........
r63067 | georg.brandl | 2008-05-11 11:05:13 -0400 (Sun, 11 May 2008) | 2 lines
#1326: document and test zipimporter.archive and zipimporter.prefix.
........
r63068 | georg.brandl | 2008-05-11 11:07:39 -0400 (Sun, 11 May 2008) | 2 lines
#2816: clarify error messages for EOF while scanning strings.
........
r63069 | georg.brandl | 2008-05-11 11:17:41 -0400 (Sun, 11 May 2008) | 3 lines
#2787: Flush stdout after writing test name, helpful when running
hanging or long-running tests. Patch by Adam Olsen.
........
r63070 | georg.brandl | 2008-05-11 11:20:16 -0400 (Sun, 11 May 2008) | 3 lines
#2803: fix wrong invocation of heappush in seldom-reached code.
Thanks to Matt Harden.
........
r63073 | benjamin.peterson | 2008-05-11 12:38:07 -0400 (Sun, 11 May 2008) | 2 lines
broaden .bzrignore
........
r63076 | andrew.kuchling | 2008-05-11 15:15:52 -0400 (Sun, 11 May 2008) | 1 line
Add message to test assertion
........
r63083 | andrew.kuchling | 2008-05-11 16:08:33 -0400 (Sun, 11 May 2008) | 1 line
Try setting HOME env.var to fix test on Win32
........
r63092 | georg.brandl | 2008-05-11 16:53:55 -0400 (Sun, 11 May 2008) | 2 lines
#2809 followup: even better split docstring.
........
r63094 | georg.brandl | 2008-05-11 17:03:42 -0400 (Sun, 11 May 2008) | 4 lines
- #2250: Exceptions raised during evaluation of names in rlcompleter's
``Completer.complete()`` method are now caught and ignored.
........
r63095 | georg.brandl | 2008-05-11 17:16:37 -0400 (Sun, 11 May 2008) | 2 lines
Clarify os.strerror()s exception behavior.
........
r63097 | georg.brandl | 2008-05-11 17:34:10 -0400 (Sun, 11 May 2008) | 2 lines
#2535: remove duplicated method.
........
r63104 | alexandre.vassalotti | 2008-05-11 19:04:27 -0400 (Sun, 11 May 2008) | 2 lines
Moved the Queue module stub in lib-old.
........
2008-05-15 21:41:41 -03:00
|
|
|
def testZipImporterMethodsInSubDirectory(self):
|
|
|
|
packdir = TESTPACK + os.sep
|
|
|
|
packdir2 = packdir + TESTPACK2 + os.sep
|
|
|
|
files = {packdir2 + "__init__" + pyc_ext: (NOW, test_pyc),
|
|
|
|
packdir2 + TESTMOD + pyc_ext: (NOW, test_pyc)}
|
|
|
|
|
|
|
|
z = ZipFile(TEMP_ZIP, "w")
|
|
|
|
try:
|
|
|
|
for name, (mtime, data) in files.items():
|
|
|
|
zinfo = ZipInfo(name, time.localtime(mtime))
|
|
|
|
zinfo.compress_type = self.compression
|
2013-02-16 11:43:45 -04:00
|
|
|
zinfo.comment = b"eggs"
|
Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63066 | georg.brandl | 2008-05-11 10:56:04 -0400 (Sun, 11 May 2008) | 2 lines
#2709 followup: better description of Tk's pros and cons.
........
r63067 | georg.brandl | 2008-05-11 11:05:13 -0400 (Sun, 11 May 2008) | 2 lines
#1326: document and test zipimporter.archive and zipimporter.prefix.
........
r63068 | georg.brandl | 2008-05-11 11:07:39 -0400 (Sun, 11 May 2008) | 2 lines
#2816: clarify error messages for EOF while scanning strings.
........
r63069 | georg.brandl | 2008-05-11 11:17:41 -0400 (Sun, 11 May 2008) | 3 lines
#2787: Flush stdout after writing test name, helpful when running
hanging or long-running tests. Patch by Adam Olsen.
........
r63070 | georg.brandl | 2008-05-11 11:20:16 -0400 (Sun, 11 May 2008) | 3 lines
#2803: fix wrong invocation of heappush in seldom-reached code.
Thanks to Matt Harden.
........
r63073 | benjamin.peterson | 2008-05-11 12:38:07 -0400 (Sun, 11 May 2008) | 2 lines
broaden .bzrignore
........
r63076 | andrew.kuchling | 2008-05-11 15:15:52 -0400 (Sun, 11 May 2008) | 1 line
Add message to test assertion
........
r63083 | andrew.kuchling | 2008-05-11 16:08:33 -0400 (Sun, 11 May 2008) | 1 line
Try setting HOME env.var to fix test on Win32
........
r63092 | georg.brandl | 2008-05-11 16:53:55 -0400 (Sun, 11 May 2008) | 2 lines
#2809 followup: even better split docstring.
........
r63094 | georg.brandl | 2008-05-11 17:03:42 -0400 (Sun, 11 May 2008) | 4 lines
- #2250: Exceptions raised during evaluation of names in rlcompleter's
``Completer.complete()`` method are now caught and ignored.
........
r63095 | georg.brandl | 2008-05-11 17:16:37 -0400 (Sun, 11 May 2008) | 2 lines
Clarify os.strerror()s exception behavior.
........
r63097 | georg.brandl | 2008-05-11 17:34:10 -0400 (Sun, 11 May 2008) | 2 lines
#2535: remove duplicated method.
........
r63104 | alexandre.vassalotti | 2008-05-11 19:04:27 -0400 (Sun, 11 May 2008) | 2 lines
Moved the Queue module stub in lib-old.
........
2008-05-15 21:41:41 -03:00
|
|
|
z.writestr(zinfo, data)
|
|
|
|
z.close()
|
|
|
|
|
|
|
|
zi = zipimport.zipimporter(TEMP_ZIP + os.sep + packdir)
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(zi.archive, TEMP_ZIP)
|
|
|
|
self.assertEqual(zi.prefix, packdir)
|
|
|
|
self.assertEqual(zi.is_package(TESTPACK2), True)
|
2008-12-14 07:50:48 -04:00
|
|
|
mod = zi.load_module(TESTPACK2)
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(zi.get_filename(TESTPACK2), mod.__file__)
|
Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63066 | georg.brandl | 2008-05-11 10:56:04 -0400 (Sun, 11 May 2008) | 2 lines
#2709 followup: better description of Tk's pros and cons.
........
r63067 | georg.brandl | 2008-05-11 11:05:13 -0400 (Sun, 11 May 2008) | 2 lines
#1326: document and test zipimporter.archive and zipimporter.prefix.
........
r63068 | georg.brandl | 2008-05-11 11:07:39 -0400 (Sun, 11 May 2008) | 2 lines
#2816: clarify error messages for EOF while scanning strings.
........
r63069 | georg.brandl | 2008-05-11 11:17:41 -0400 (Sun, 11 May 2008) | 3 lines
#2787: Flush stdout after writing test name, helpful when running
hanging or long-running tests. Patch by Adam Olsen.
........
r63070 | georg.brandl | 2008-05-11 11:20:16 -0400 (Sun, 11 May 2008) | 3 lines
#2803: fix wrong invocation of heappush in seldom-reached code.
Thanks to Matt Harden.
........
r63073 | benjamin.peterson | 2008-05-11 12:38:07 -0400 (Sun, 11 May 2008) | 2 lines
broaden .bzrignore
........
r63076 | andrew.kuchling | 2008-05-11 15:15:52 -0400 (Sun, 11 May 2008) | 1 line
Add message to test assertion
........
r63083 | andrew.kuchling | 2008-05-11 16:08:33 -0400 (Sun, 11 May 2008) | 1 line
Try setting HOME env.var to fix test on Win32
........
r63092 | georg.brandl | 2008-05-11 16:53:55 -0400 (Sun, 11 May 2008) | 2 lines
#2809 followup: even better split docstring.
........
r63094 | georg.brandl | 2008-05-11 17:03:42 -0400 (Sun, 11 May 2008) | 4 lines
- #2250: Exceptions raised during evaluation of names in rlcompleter's
``Completer.complete()`` method are now caught and ignored.
........
r63095 | georg.brandl | 2008-05-11 17:16:37 -0400 (Sun, 11 May 2008) | 2 lines
Clarify os.strerror()s exception behavior.
........
r63097 | georg.brandl | 2008-05-11 17:34:10 -0400 (Sun, 11 May 2008) | 2 lines
#2535: remove duplicated method.
........
r63104 | alexandre.vassalotti | 2008-05-11 19:04:27 -0400 (Sun, 11 May 2008) | 2 lines
Moved the Queue module stub in lib-old.
........
2008-05-15 21:41:41 -03:00
|
|
|
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(
|
2010-04-16 21:19:56 -03:00
|
|
|
zi.is_package(TESTPACK2 + os.sep + '__init__'), False)
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(
|
2010-04-16 21:19:56 -03:00
|
|
|
zi.is_package(TESTPACK2 + os.sep + TESTMOD), False)
|
Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63066 | georg.brandl | 2008-05-11 10:56:04 -0400 (Sun, 11 May 2008) | 2 lines
#2709 followup: better description of Tk's pros and cons.
........
r63067 | georg.brandl | 2008-05-11 11:05:13 -0400 (Sun, 11 May 2008) | 2 lines
#1326: document and test zipimporter.archive and zipimporter.prefix.
........
r63068 | georg.brandl | 2008-05-11 11:07:39 -0400 (Sun, 11 May 2008) | 2 lines
#2816: clarify error messages for EOF while scanning strings.
........
r63069 | georg.brandl | 2008-05-11 11:17:41 -0400 (Sun, 11 May 2008) | 3 lines
#2787: Flush stdout after writing test name, helpful when running
hanging or long-running tests. Patch by Adam Olsen.
........
r63070 | georg.brandl | 2008-05-11 11:20:16 -0400 (Sun, 11 May 2008) | 3 lines
#2803: fix wrong invocation of heappush in seldom-reached code.
Thanks to Matt Harden.
........
r63073 | benjamin.peterson | 2008-05-11 12:38:07 -0400 (Sun, 11 May 2008) | 2 lines
broaden .bzrignore
........
r63076 | andrew.kuchling | 2008-05-11 15:15:52 -0400 (Sun, 11 May 2008) | 1 line
Add message to test assertion
........
r63083 | andrew.kuchling | 2008-05-11 16:08:33 -0400 (Sun, 11 May 2008) | 1 line
Try setting HOME env.var to fix test on Win32
........
r63092 | georg.brandl | 2008-05-11 16:53:55 -0400 (Sun, 11 May 2008) | 2 lines
#2809 followup: even better split docstring.
........
r63094 | georg.brandl | 2008-05-11 17:03:42 -0400 (Sun, 11 May 2008) | 4 lines
- #2250: Exceptions raised during evaluation of names in rlcompleter's
``Completer.complete()`` method are now caught and ignored.
........
r63095 | georg.brandl | 2008-05-11 17:16:37 -0400 (Sun, 11 May 2008) | 2 lines
Clarify os.strerror()s exception behavior.
........
r63097 | georg.brandl | 2008-05-11 17:34:10 -0400 (Sun, 11 May 2008) | 2 lines
#2535: remove duplicated method.
........
r63104 | alexandre.vassalotti | 2008-05-11 19:04:27 -0400 (Sun, 11 May 2008) | 2 lines
Moved the Queue module stub in lib-old.
........
2008-05-15 21:41:41 -03:00
|
|
|
|
2015-07-22 11:57:56 -03:00
|
|
|
pkg_path = TEMP_ZIP + os.sep + packdir + TESTPACK2
|
|
|
|
zi2 = zipimport.zipimporter(pkg_path)
|
|
|
|
find_mod_dotted = zi2.find_module(TESTMOD)
|
|
|
|
self.assertIsNotNone(find_mod_dotted)
|
|
|
|
self.assertIsInstance(find_mod_dotted, zipimport.zipimporter)
|
|
|
|
self.assertFalse(zi2.is_package(TESTMOD))
|
|
|
|
load_mod = find_mod_dotted.load_module(TESTMOD)
|
|
|
|
self.assertEqual(
|
|
|
|
find_mod_dotted.get_filename(TESTMOD), load_mod.__file__)
|
|
|
|
|
2008-12-14 07:50:48 -04:00
|
|
|
mod_path = TESTPACK2 + os.sep + TESTMOD
|
|
|
|
mod_name = module_path_to_dotted_name(mod_path)
|
2016-01-15 15:22:19 -04:00
|
|
|
mod = importlib.import_module(mod_name)
|
|
|
|
self.assertTrue(mod_name in sys.modules)
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(zi.get_source(TESTPACK2), None)
|
|
|
|
self.assertEqual(zi.get_source(mod_path), None)
|
|
|
|
self.assertEqual(zi.get_filename(mod_path), mod.__file__)
|
2010-04-16 21:19:56 -03:00
|
|
|
# To pass in the module name instead of the path, we must use the
|
2016-01-15 15:22:19 -04:00
|
|
|
# right importer.
|
2008-12-14 07:50:48 -04:00
|
|
|
loader = mod.__loader__
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(loader.get_source(mod_name), None)
|
|
|
|
self.assertEqual(loader.get_filename(mod_name), mod.__file__)
|
Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63066 | georg.brandl | 2008-05-11 10:56:04 -0400 (Sun, 11 May 2008) | 2 lines
#2709 followup: better description of Tk's pros and cons.
........
r63067 | georg.brandl | 2008-05-11 11:05:13 -0400 (Sun, 11 May 2008) | 2 lines
#1326: document and test zipimporter.archive and zipimporter.prefix.
........
r63068 | georg.brandl | 2008-05-11 11:07:39 -0400 (Sun, 11 May 2008) | 2 lines
#2816: clarify error messages for EOF while scanning strings.
........
r63069 | georg.brandl | 2008-05-11 11:17:41 -0400 (Sun, 11 May 2008) | 3 lines
#2787: Flush stdout after writing test name, helpful when running
hanging or long-running tests. Patch by Adam Olsen.
........
r63070 | georg.brandl | 2008-05-11 11:20:16 -0400 (Sun, 11 May 2008) | 3 lines
#2803: fix wrong invocation of heappush in seldom-reached code.
Thanks to Matt Harden.
........
r63073 | benjamin.peterson | 2008-05-11 12:38:07 -0400 (Sun, 11 May 2008) | 2 lines
broaden .bzrignore
........
r63076 | andrew.kuchling | 2008-05-11 15:15:52 -0400 (Sun, 11 May 2008) | 1 line
Add message to test assertion
........
r63083 | andrew.kuchling | 2008-05-11 16:08:33 -0400 (Sun, 11 May 2008) | 1 line
Try setting HOME env.var to fix test on Win32
........
r63092 | georg.brandl | 2008-05-11 16:53:55 -0400 (Sun, 11 May 2008) | 2 lines
#2809 followup: even better split docstring.
........
r63094 | georg.brandl | 2008-05-11 17:03:42 -0400 (Sun, 11 May 2008) | 4 lines
- #2250: Exceptions raised during evaluation of names in rlcompleter's
``Completer.complete()`` method are now caught and ignored.
........
r63095 | georg.brandl | 2008-05-11 17:16:37 -0400 (Sun, 11 May 2008) | 2 lines
Clarify os.strerror()s exception behavior.
........
r63097 | georg.brandl | 2008-05-11 17:34:10 -0400 (Sun, 11 May 2008) | 2 lines
#2535: remove duplicated method.
........
r63104 | alexandre.vassalotti | 2008-05-11 19:04:27 -0400 (Sun, 11 May 2008) | 2 lines
Moved the Queue module stub in lib-old.
........
2008-05-15 21:41:41 -03:00
|
|
|
finally:
|
|
|
|
z.close()
|
|
|
|
os.remove(TEMP_ZIP)
|
|
|
|
|
2002-12-30 18:08:05 -04:00
|
|
|
def testGetData(self):
|
|
|
|
z = ZipFile(TEMP_ZIP, "w")
|
|
|
|
z.compression = self.compression
|
|
|
|
try:
|
|
|
|
name = "testdata.dat"
|
2007-08-03 15:40:49 -03:00
|
|
|
data = bytes(x for x in range(256))
|
2002-12-30 18:08:05 -04:00
|
|
|
z.writestr(name, data)
|
|
|
|
z.close()
|
|
|
|
zi = zipimport.zipimporter(TEMP_ZIP)
|
2010-11-20 15:04:17 -04:00
|
|
|
self.assertEqual(data, zi.get_data(name))
|
2010-01-18 20:09:57 -04:00
|
|
|
self.assertIn('zipimporter object', repr(zi))
|
2002-12-30 18:08:05 -04:00
|
|
|
finally:
|
|
|
|
z.close()
|
|
|
|
os.remove(TEMP_ZIP)
|
|
|
|
|
2017-08-30 08:08:39 -03:00
|
|
|
def test_issue31291(self):
|
|
|
|
# There shouldn't be an assertion failure in get_data().
|
|
|
|
class FunnyStr(str):
|
|
|
|
def replace(self, old, new):
|
|
|
|
return 42
|
|
|
|
z = ZipFile(TEMP_ZIP, "w")
|
|
|
|
try:
|
|
|
|
name = "test31291.dat"
|
|
|
|
data = b'foo'
|
|
|
|
z.writestr(name, data)
|
|
|
|
z.close()
|
|
|
|
zi = zipimport.zipimporter(TEMP_ZIP)
|
|
|
|
self.assertEqual(data, zi.get_data(FunnyStr(name)))
|
|
|
|
finally:
|
|
|
|
z.close()
|
|
|
|
os.remove(TEMP_ZIP)
|
|
|
|
|
2002-12-30 18:08:05 -04:00
|
|
|
def testImporterAttr(self):
|
|
|
|
src = """if 1: # indent hack
|
|
|
|
def get_file():
|
|
|
|
return __file__
|
2007-08-03 15:40:49 -03:00
|
|
|
if __loader__.get_data("some.data") != b"some data":
|
2007-08-30 21:04:24 -03:00
|
|
|
raise AssertionError("bad data")\n"""
|
2012-01-13 13:52:16 -04:00
|
|
|
pyc = make_pyc(compile(src, "<???>", "exec"), NOW, len(src))
|
2002-12-30 18:08:05 -04:00
|
|
|
files = {TESTMOD + pyc_ext: (NOW, pyc),
|
|
|
|
"some.data": (NOW, "some data")}
|
|
|
|
self.doTest(pyc_ext, files, TESTMOD)
|
|
|
|
|
2016-09-14 02:09:48 -03:00
|
|
|
def testDefaultOptimizationLevel(self):
|
|
|
|
# zipimport should use the default optimization level (#28131)
|
|
|
|
src = """if 1: # indent hack
|
|
|
|
def test(val):
|
|
|
|
assert(val)
|
|
|
|
return val\n"""
|
|
|
|
files = {TESTMOD + '.py': (NOW, src)}
|
|
|
|
self.makeZip(files)
|
|
|
|
sys.path.insert(0, TEMP_ZIP)
|
|
|
|
mod = importlib.import_module(TESTMOD)
|
|
|
|
self.assertEqual(mod.test(1), 1)
|
|
|
|
self.assertRaises(AssertionError, mod.test, False)
|
|
|
|
|
2003-07-22 15:10:15 -03:00
|
|
|
def testImport_WithStuff(self):
|
|
|
|
# try importing from a zipfile which contains additional
|
|
|
|
# stuff at the beginning of the file
|
|
|
|
files = {TESTMOD + ".py": (NOW, test_src)}
|
|
|
|
self.doTest(".py", files, TESTMOD,
|
2007-08-27 14:03:28 -03:00
|
|
|
stuff=b"Some Stuff"*31)
|
2002-12-30 18:08:05 -04:00
|
|
|
|
2006-04-21 07:40:58 -03:00
|
|
|
def assertModuleSource(self, module):
|
|
|
|
self.assertEqual(inspect.getsource(module), test_src)
|
|
|
|
|
|
|
|
def testGetSource(self):
|
|
|
|
files = {TESTMOD + ".py": (NOW, test_src)}
|
|
|
|
self.doTest(".py", files, TESTMOD, call=self.assertModuleSource)
|
|
|
|
|
|
|
|
def testGetCompiledSource(self):
|
2012-01-13 13:52:16 -04:00
|
|
|
pyc = make_pyc(compile(test_src, "<???>", "exec"), NOW, len(test_src))
|
2006-04-21 07:40:58 -03:00
|
|
|
files = {TESTMOD + ".py": (NOW, test_src),
|
|
|
|
TESTMOD + pyc_ext: (NOW, pyc)}
|
|
|
|
self.doTest(pyc_ext, files, TESTMOD, call=self.assertModuleSource)
|
|
|
|
|
|
|
|
def runDoctest(self, callback):
|
|
|
|
files = {TESTMOD + ".py": (NOW, test_src),
|
|
|
|
"xyz.txt": (NOW, ">>> log.append(True)\n")}
|
|
|
|
self.doTest(".py", files, TESTMOD, call=callback)
|
|
|
|
|
|
|
|
def doDoctestFile(self, module):
|
|
|
|
log = []
|
|
|
|
old_master, doctest.master = doctest.master, None
|
|
|
|
try:
|
|
|
|
doctest.testfile(
|
|
|
|
'xyz.txt', package=module, module_relative=True,
|
|
|
|
globs=locals()
|
|
|
|
)
|
|
|
|
finally:
|
|
|
|
doctest.master = old_master
|
|
|
|
self.assertEqual(log,[True])
|
|
|
|
|
|
|
|
def testDoctestFile(self):
|
|
|
|
self.runDoctest(self.doDoctestFile)
|
|
|
|
|
|
|
|
def doDoctestSuite(self, module):
|
|
|
|
log = []
|
|
|
|
doctest.DocFileTest(
|
|
|
|
'xyz.txt', package=module, module_relative=True,
|
|
|
|
globs=locals()
|
|
|
|
).run()
|
|
|
|
self.assertEqual(log,[True])
|
|
|
|
|
|
|
|
def testDoctestSuite(self):
|
|
|
|
self.runDoctest(self.doDoctestSuite)
|
|
|
|
|
|
|
|
def doTraceback(self, module):
|
|
|
|
try:
|
|
|
|
module.do_raise()
|
|
|
|
except:
|
|
|
|
tb = sys.exc_info()[2].tb_next
|
|
|
|
|
|
|
|
f,lno,n,line = extract_tb(tb, 1)[0]
|
|
|
|
self.assertEqual(line, raise_src.strip())
|
|
|
|
|
|
|
|
f,lno,n,line = extract_stack(tb.tb_frame, 1)[0]
|
|
|
|
self.assertEqual(line, raise_src.strip())
|
|
|
|
|
2007-08-08 22:03:29 -03:00
|
|
|
s = io.StringIO()
|
2006-04-21 07:40:58 -03:00
|
|
|
print_tb(tb, 1, s)
|
2009-06-30 20:06:06 -03:00
|
|
|
self.assertTrue(s.getvalue().endswith(raise_src))
|
2006-04-21 07:40:58 -03:00
|
|
|
else:
|
|
|
|
raise AssertionError("This ought to be impossible")
|
|
|
|
|
|
|
|
def testTraceback(self):
|
|
|
|
files = {TESTMOD + ".py": (NOW, raise_src)}
|
|
|
|
self.doTest(None, files, TESTMOD, call=self.doTraceback)
|
|
|
|
|
2010-08-16 14:54:28 -03:00
|
|
|
@unittest.skipIf(support.TESTFN_UNENCODABLE is None,
|
|
|
|
"need an unencodable filename")
|
2010-08-16 21:44:11 -03:00
|
|
|
def testUnencodable(self):
|
2010-08-16 14:54:28 -03:00
|
|
|
filename = support.TESTFN_UNENCODABLE + ".zip"
|
|
|
|
z = ZipFile(filename, "w")
|
|
|
|
zinfo = ZipInfo(TESTMOD + ".py", time.localtime(NOW))
|
|
|
|
zinfo.compress_type = self.compression
|
|
|
|
z.writestr(zinfo, test_src)
|
|
|
|
z.close()
|
|
|
|
try:
|
2016-09-09 21:27:33 -03:00
|
|
|
zipimport.zipimporter(filename).load_module(TESTMOD)
|
2010-08-16 14:54:28 -03:00
|
|
|
finally:
|
|
|
|
os.remove(filename)
|
|
|
|
|
2016-06-18 07:53:36 -03:00
|
|
|
def testBytesPath(self):
|
|
|
|
filename = support.TESTFN + ".zip"
|
|
|
|
self.addCleanup(support.unlink, filename)
|
|
|
|
with ZipFile(filename, "w") as z:
|
|
|
|
zinfo = ZipInfo(TESTMOD + ".py", time.localtime(NOW))
|
|
|
|
zinfo.compress_type = self.compression
|
|
|
|
z.writestr(zinfo, test_src)
|
|
|
|
|
|
|
|
zipimport.zipimporter(filename)
|
|
|
|
zipimport.zipimporter(os.fsencode(filename))
|
2016-08-06 17:29:29 -03:00
|
|
|
with self.assertWarns(DeprecationWarning):
|
|
|
|
zipimport.zipimporter(bytearray(os.fsencode(filename)))
|
|
|
|
with self.assertWarns(DeprecationWarning):
|
|
|
|
zipimport.zipimporter(memoryview(os.fsencode(filename)))
|
2016-06-18 07:53:36 -03:00
|
|
|
|
2006-04-21 07:40:58 -03:00
|
|
|
|
2011-05-19 16:03:22 -03:00
|
|
|
@support.requires_zlib
|
2002-12-30 18:08:05 -04:00
|
|
|
class CompressedZipImportTestCase(UncompressedZipImportTestCase):
|
|
|
|
compression = ZIP_DEFLATED
|
|
|
|
|
|
|
|
|
2006-01-23 03:52:13 -04:00
|
|
|
class BadFileZipImportTestCase(unittest.TestCase):
|
|
|
|
def assertZipFailure(self, filename):
|
2014-02-16 15:12:57 -04:00
|
|
|
self.assertRaises(zipimport.ZipImportError,
|
|
|
|
zipimport.zipimporter, filename)
|
2006-01-23 03:52:13 -04:00
|
|
|
|
|
|
|
def testNoFile(self):
|
|
|
|
self.assertZipFailure('AdfjdkFJKDFJjdklfjs')
|
|
|
|
|
|
|
|
def testEmptyFilename(self):
|
|
|
|
self.assertZipFailure('')
|
|
|
|
|
|
|
|
def testBadArgs(self):
|
|
|
|
self.assertRaises(TypeError, zipimport.zipimporter, None)
|
|
|
|
self.assertRaises(TypeError, zipimport.zipimporter, TESTMOD, kwd=None)
|
2016-06-18 07:53:36 -03:00
|
|
|
self.assertRaises(TypeError, zipimport.zipimporter,
|
|
|
|
list(os.fsencode(TESTMOD)))
|
2006-01-23 03:52:13 -04:00
|
|
|
|
|
|
|
def testFilenameTooLong(self):
|
|
|
|
self.assertZipFailure('A' * 33000)
|
|
|
|
|
|
|
|
def testEmptyFile(self):
|
2008-05-20 18:35:26 -03:00
|
|
|
support.unlink(TESTMOD)
|
2011-06-30 18:25:47 -03:00
|
|
|
support.create_empty_file(TESTMOD)
|
2006-01-23 03:52:13 -04:00
|
|
|
self.assertZipFailure(TESTMOD)
|
|
|
|
|
|
|
|
def testFileUnreadable(self):
|
2008-05-20 18:35:26 -03:00
|
|
|
support.unlink(TESTMOD)
|
2006-01-23 03:52:13 -04:00
|
|
|
fd = os.open(TESTMOD, os.O_CREAT, 000)
|
2006-01-23 18:19:24 -04:00
|
|
|
try:
|
|
|
|
os.close(fd)
|
2015-03-20 06:52:25 -03:00
|
|
|
|
|
|
|
with self.assertRaises(zipimport.ZipImportError) as cm:
|
|
|
|
zipimport.zipimporter(TESTMOD)
|
2006-01-23 18:19:24 -04:00
|
|
|
finally:
|
|
|
|
# If we leave "the read-only bit" set on Windows, nothing can
|
|
|
|
# delete TESTMOD, and later tests suffer bogus failures.
|
Merged revisions 55817-55961 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines
PEP 3119 -- the abc module.
................
r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines
Implement part of PEP 3119 -- One Trick Ponies.
................
r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines
Different way to do one trick ponies, allowing registration (per PEP strawman).
................
r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines
Make sure that the magic looking for __hash__ (etc.) doesn't apply to
real subclasses of Hashable.
................
r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines
Add some more examples, e.g. generators and dict views.
................
r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines
keys() and items() *are* containers -- just values() isn't.
................
r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines
PEP 3127: new octal literals, binary literals.
................
r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines
Some octal literal fixes in Tools.
................
r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines
Tokenizer changes for PEP 3127.
................
r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines
Some docs for PEP 3127.
................
r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines
Missed a place in intobject.c. Is that used anymore anyway?
................
r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines
Merged revisions 55729-55868 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines
SF 1668596/1720897: distutils now copies data files
even if package_dir is empty.
This needs to be backported. I'm too tired tonight. It would be great
if someone backports this if the buildbots are ok with it. Otherwise,
I will try to get to it tomorrow.
........
r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines
Bug #1722484: remove docstrings again when running with -OO.
........
r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines
Fix wrong issue number.
........
r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines
Have configure raise an error when building on AtheOS. Code specific to AtheOS
will be removed in Python 2.7.
........
r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line
Update expected birthday of 2.6
........
r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines
Backout the original 'fix' to 1721309 which had no effect.
Different versions of Berkeley DB handle this differently.
The comments and bug report should have the details. Memory is allocated
in 4.4 (and presumably earlier), but not in 4.5. Thus
4.5 has the free error, but not earlier versions.
Mostly update comments, plus make the free conditional.
This fix was already applied to the 2.5 branch.
........
r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines
Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead
of ``\s*``. This prevents patterns from "stealing" bits from other patterns in
order to make a match work.
Closes bug #1730389. Will be backported.
........
r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines
Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different
from Linux's. Just fix the build for now but the code doesn't
support the complete capability of HCI on FreeBSD yet.
........
r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines
Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it
reads a file that ends with incomplete sequence and sizehint argument
for .read() is specified.
........
r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines
Fix for Windows: close a temporary file before trying to delete it.
........
r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines
Patch by Tim Delany (missing DECREF). SF #1731330.
........
r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines
Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O).
........
r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines
FTP.ntransfercmd method now uses create_connection when passive,
using the timeout received in connection time.
........
r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines
Added an optional timeout parameter to function urllib2.urlopen,
with tests in test_urllib2net.py (must have network resource
enabled to execute them). Also modified test_urllib2.py because
testing mock classes must take it into acount. Docs are also
updated.
........
r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line
Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration.
........
r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines
Disallow function calls like foo(None=1).
Backport from py3k rev. 55708 by Guido.
........
r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines
Make reindent.py executable.
........
r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines
Patch #1667860: Fix UnboundLocalError in urllib2.
........
r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line
Fixing changes to getbuildinfo.c that broke linux builds
........
r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line
Make this test work with older Python releases where struct has no 't' format character.
........
r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines
Bug #1733488: Fix compilation of bufferobject.c on AIX.
Will backport to 2.5.
........
r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines
[ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur
with small modifications.
........
r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line
Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls.
........
r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines
Fix wrong documentation, and correct the punktuation.
Closes [1700455].
........
r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line
Fix warnings by using proper function prototype.
........
r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines
Prevent expandtabs() on string and unicode objects from causing a segfault when
a large width is passed on 32-bit platforms. Found by Google.
It would be good for people to review this especially carefully and verify
I don't have an off by one error and there is no other way to cause overflow.
........
r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line
Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error.
........
r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines
Patch #1733960: Allow T_LONGLONG to accept ints.
Will backport to 2.5.
........
r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines
Fix Windows build.
........
r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines
Provide LLONG_MAX for S390.
........
r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines
First version of build scripts for Windows/AMD64 (no external
components are built yet, and 'kill_python' is disabled).
........
r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines
For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter
modules in the ReleaseAMD64 configuration because they do not compile.
........
r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line
Need to set the environment variables, otherwise devenv.com is not found.
........
r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line
Revert commit 55855.
........
................
r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix the refleak counter on test_collections. The ABC metaclass creates
a registry which must be cleared on each run. Otherwise, there *seem*
to be refleaks when there really aren't any. (The class is held within
the registry even though it's no longer needed.)
................
r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line
These tests have been removed, so they are no longer needed here
................
r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines
Optimize access to True and False in the compiler (if True)
and the peepholer (LOAD_NAME True).
................
r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines
Remove __oct__ and __hex__ and use __index__ for converting
non-ints before formatting in a base.
Add a bin() builtin.
................
r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines
int(x, 0) does not "guess".
................
r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines
Add a comment to explain that nb_oct and nb_hex are nonfunctional.
................
r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines
Get rid of unused imports and comment.
................
r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines
_Abstract.__new__ now requires either no arguments or __init__ overridden.
................
r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines
Move the collections ABCs to a separate file, _abcoll.py, in order to avoid
needing to import _collections.so during the bootstrap (this will become
apparent in the next submit of os.py).
Add (plain and mutable) ABCs for Set, Mapping, Sequence.
................
r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines
Rewrite the _Environ class to use the new collections ABCs.
................
r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines
Merged revisions 55869-55912 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line
Add Atul Varma for patch # 1667860
........
r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line
Ignore valgrind problems on Ubuntu from ld
........
r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines
Ignore config.status.lineno which seems new (new autoconf?)
........
r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent these tests from running on Win64 since they don\'t apply there either
........
r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines
Fix a bug when there was a newline in the string expandtabs was called on.
This also catches another condition that can overflow.
Will backport.
........
r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line
Prevent hang if the port cannot be opened.
........
r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines
Add all of the distuils modules that don't seem to have explicit tests. :-(
Move an import in mworkscompiler so that this module can be imported on
any platform. Hopefully this works on all platforms.
........
r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines
SF #1734732, lower case the module names per PEP 8.
Will backport.
........
r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines
Not sure why this only fails sometimes on Unix machines. Better
to disable it and only import msvccompiler on Windows since that's
the only place it can work anyways.
........
r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines
Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute.
Will backport
........
r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line
Reflow long line
........
r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines
Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k"
or "K" codes.
........
r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines
Added versionchanged flag to all the methods which received
a new optional timeout parameter, and a versionadded flag to
the socket.create_connection function.
........
................
r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines
New super() implementation, for PEP 3135 (though the PEP is not yet updated
to this design, and small tweaks may still be made later).
................
r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines
I'm guessing this module broke when Neal ripped out the types module --
it used 'list' both as a local variable and as the built-in list type.
Renamed the local variable since that was easier.
................
r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines
Change all occurrences of super(<thisclass>, <firstarg>) to super().
Seems to have worked, all the tests still pass.
Exception: test_descr and test_descrtut, which have tons of these
and are there to test the various usages.
................
r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line
Patch #1735485: remove StandardError from the exception hierarchy.
................
r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines
Merged revisions 55913-55950 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines
Apply patch #1734945 to support TurboLinux as distribution.
........
r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines
Add patch #1726668: Windows Vista support.
........
r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line
Checkout, but do not yet try to build, exernal sources.
........
r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
Set the /XP64 /RETAIL build enviroment in the makefile when building
ReleaseAMD64.
........
r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines
Revert this change, since it breaks the win32 build:
Add bufferoverflowU.lib to the libraries needed by _ssl (is this the
right thing to do?).
........
r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines
Specify the bufferoverflowU.lib to the makefile on the command line
(for ReleaseAMD64 builds).
........
r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines
Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj.
Build sqlite3.dll and bsddb.
........
r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines
Don't rebuild Berkeley DB if not needed (this was committed by accident).
........
r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines
Provide PY_LLONG_MAX on all systems having long long.
Will backport to 2.5.
........
................
r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines
Fix a compilation warning.
................
2007-06-13 15:07:49 -03:00
|
|
|
os.chmod(TESTMOD, 0o666)
|
2008-05-20 18:35:26 -03:00
|
|
|
support.unlink(TESTMOD)
|
2006-01-23 03:52:13 -04:00
|
|
|
|
|
|
|
def testNotZipFile(self):
|
2008-05-20 18:35:26 -03:00
|
|
|
support.unlink(TESTMOD)
|
2006-01-23 03:52:13 -04:00
|
|
|
fp = open(TESTMOD, 'w+')
|
|
|
|
fp.write('a' * 22)
|
|
|
|
fp.close()
|
|
|
|
self.assertZipFailure(TESTMOD)
|
|
|
|
|
2006-01-23 04:48:03 -04:00
|
|
|
# XXX: disabled until this works on Big-endian machines
|
|
|
|
def _testBogusZipFile(self):
|
2008-05-20 18:35:26 -03:00
|
|
|
support.unlink(TESTMOD)
|
2006-01-23 03:52:13 -04:00
|
|
|
fp = open(TESTMOD, 'w+')
|
|
|
|
fp.write(struct.pack('=I', 0x06054B50))
|
|
|
|
fp.write('a' * 18)
|
|
|
|
fp.close()
|
|
|
|
z = zipimport.zipimporter(TESTMOD)
|
|
|
|
|
|
|
|
try:
|
|
|
|
self.assertRaises(TypeError, z.find_module, None)
|
|
|
|
self.assertRaises(TypeError, z.load_module, None)
|
|
|
|
self.assertRaises(TypeError, z.is_package, None)
|
|
|
|
self.assertRaises(TypeError, z.get_code, None)
|
|
|
|
self.assertRaises(TypeError, z.get_data, None)
|
|
|
|
self.assertRaises(TypeError, z.get_source, None)
|
|
|
|
|
|
|
|
error = zipimport.ZipImportError
|
|
|
|
self.assertEqual(z.find_module('abc'), None)
|
|
|
|
|
|
|
|
self.assertRaises(error, z.load_module, 'abc')
|
|
|
|
self.assertRaises(error, z.get_code, 'abc')
|
2012-12-25 10:47:37 -04:00
|
|
|
self.assertRaises(OSError, z.get_data, 'abc')
|
2006-01-23 03:52:13 -04:00
|
|
|
self.assertRaises(error, z.get_source, 'abc')
|
|
|
|
self.assertRaises(error, z.is_package, 'abc')
|
|
|
|
finally:
|
|
|
|
zipimport._zip_directory_cache.clear()
|
|
|
|
|
|
|
|
|
2003-02-17 14:05:20 -04:00
|
|
|
def test_main():
|
2006-01-23 03:52:13 -04:00
|
|
|
try:
|
2008-05-20 18:35:26 -03:00
|
|
|
support.run_unittest(
|
2006-01-23 03:52:13 -04:00
|
|
|
UncompressedZipImportTestCase,
|
|
|
|
CompressedZipImportTestCase,
|
|
|
|
BadFileZipImportTestCase,
|
|
|
|
)
|
|
|
|
finally:
|
2008-05-20 18:35:26 -03:00
|
|
|
support.unlink(TESTMOD)
|
2003-02-17 14:05:20 -04:00
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
test_main()
|