[Uludag-commits] r7199 - trunk/pisi/pisi

[svn-uludag at uludag.org.tr]

Author: faik
Date: Wed Apr 19 19:49:14 2006
New Revision: 7199

Modified:
   trunk/pisi/pisi/archive.py
   trunk/pisi/pisi/zipfileext.py
Log:
FileEntry super class needed returnedBytes field for DeflatedZipEntry class.
skipped ZIP_7ZIP -> ZIP_LZMA change.


Modified: trunk/pisi/pisi/archive.py
=================================================================
--- trunk/pisi/pisi/archive.py	(original)
+++ trunk/pisi/pisi/archive.py	Wed Apr 19 19:49:14 2006
@@ -130,7 +130,7 @@
                 attr.external_attr = self.symmagic 
                 self.zip_obj.writestr(attr, dest)
             else:
-                self.zip_obj.write(file_name, file_name, zipfileext.ZIP_7ZIP)
+                self.zip_obj.write(file_name, file_name, zipfileext.ZIP_LZMA)
                 zinfo = self.zip_obj.getinfo(file_name)
                 zinfo.create_system = 3
 

Modified: trunk/pisi/pisi/zipfileext.py
=================================================================
--- trunk/pisi/pisi/zipfileext.py	(original)
+++ trunk/pisi/pisi/zipfileext.py	Wed Apr 19 19:49:14 2006
@@ -12,7 +12,7 @@
 # Authors:  Eray Ozkural <eray at pardus.org.tr>
 #           Faik Uygur   <faik at pardus.org.tr>
 #
-# Extends zipfile module with LZMA and bzip2 support
+# Extends zipfile module with lzma and bzip2 support
 
 # python standard library modules
 import os
@@ -48,10 +48,11 @@
     def __init__(self, fp, length):
         self.fp = fp
         self.readBytes = 0
+        self.returnedBytes = 0
         self.length = length
         self.finished = 0
 
-class LZMAFileEntry(FileEntry):
+class LzmaFileEntry(FileEntry):
     """File-like object used to read a LZMA entry in a ZipFile"""
 
     def __init__(self, fp, length):
@@ -291,7 +292,7 @@
             if not pylzma:
                 raise RuntimeError, \
                       "De-compression requires the (missing) pylzma module"
-	    return LZMAFileEntry(self.fp, zinfo.compress_size)
+	    return LzmaFileEntry(self.fp, zinfo.compress_size)
         else:
             raise BadZipfile, \
                   "Unsupported compression method %d for file %s" % \