[Python-checkins] python/dist/src/Lib/test test_zipimport.py, 1.10, 1.10.4.1

Tue Nov 18 18:04:30 EST 2003

Update of /cvsroot/python/python/dist/src/Lib/test
In directory sc8-pr-cvs1:/tmp/cvs-serv30772
Modified Files:
 Tag: release23-maint
	test_zipimport.py 
Log Message:
Backport of fix for [ 765456 ]: testAFakeZlib failed on platforms that use
a statically linked zlib module, but since the problem it tests can't
exist on these systems, simply skip it then.
Index: test_zipimport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_zipimport.py,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -C2 -d -r1.10 -r1.10.4.1
*** test_zipimport.py	22 Jul 2003 18:10:02 -0000	1.10
--- test_zipimport.py	18 Nov 2003 23:04:28 -0000	1.10.4.1
***************
*** 96,99 ****
--- 96,106 ----
 # item in a list sorted by name, like unittest.makeSuite() does.)
 #
+ # 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:
+ return
 if "zlib" in sys.modules:
 del sys.modules["zlib"]