From 7c596671f4954fe0a239e40018841cb4662e21b7 Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Wed, 19 Apr 2006 16:49:14 +0000 Subject: [PATCH] FileEntry super class needed returnedBytes field for DeflatedZipEntry class. skipped ZIP_7ZIP -> ZIP_LZMA change. --- pisi/archive.py | 2 +- pisi/zipfileext.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pisi/archive.py b/pisi/archive.py index fba5c8ab..6cd21765 100644 --- a/pisi/archive.py +++ b/pisi/archive.py @@ -130,7 +130,7 @@ class ArchiveZip(ArchiveBase): 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 diff --git a/pisi/zipfileext.py b/pisi/zipfileext.py index 7290168d..de389e8b 100644 --- a/pisi/zipfileext.py +++ b/pisi/zipfileext.py @@ -12,7 +12,7 @@ # Authors: Eray Ozkural # Faik Uygur # -# 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 @@ class FileEntry: 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 @@ class ZipFileExt(ZipFile): 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" % \