[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29201] trunk/blender/tools/Blender.py: support for building with scons & python 2.4x

Campbell Barton ideasman42 at gmail.com
Fri Jun 4 01:37:53 CEST 2010


Revision: 29201
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29201
Author:   campbellbarton
Date:     2010-06-04 01:37:51 +0200 (Fri, 04 Jun 2010)

Log Message:
-----------
support for building with scons & python 2.4x

Modified Paths:
--------------
    trunk/blender/tools/Blender.py

Modified: trunk/blender/tools/Blender.py
===================================================================
--- trunk/blender/tools/Blender.py	2010-06-03 22:08:14 UTC (rev 29200)
+++ trunk/blender/tools/Blender.py	2010-06-03 23:37:51 UTC (rev 29201)
@@ -356,7 +356,11 @@
 	"""Partial copy of python2.6's zipfile.ZipFile (see http://www.python.org)
 	to get a extractall() that works on py2.5 and probably earlier distributions."""
 	def __init__(self, file, mode="r", compression=zipfile.ZIP_STORED, allowZip64=False):
-		zipfile.ZipFile.__init__(self, file, mode, compression, allowZip64)
+		if sys.version_info < (2, 6):
+			zipfile.ZipFile.__init__(self, file, mode, compression)
+		else:
+			zipfile.ZipFile.__init__(self, file, mode, compression, allowZip64)
+
 		if not hasattr(self,"extractall"): # use our method 
 			print "Debug: Using comp_extractall!"
 			self.extractall= self.comp_extractall





More information about the Bf-blender-cvs mailing list