diff --git a/zipstream.py b/zipstream.py index a285897..c3dcfd1 100644 --- a/zipstream.py +++ b/zipstream.py @@ -192,13 +192,14 @@ def __init__(self, path, arc_path='', compression=ZIP_DEFLATED): self.filelist = [] # List of ZipInfo instances for archive self.compression = compression # Method of compression - self.path = path # source path + self.path = path if isinstance(path, list) else [path] # source path / list of paths self.arc_path = arc_path # top level path in archive self.data_ptr = 0 # Keep track of location inside archive def __iter__(self): - for data in self.zip_path(self.path, self.arc_path): - yield data + for p in self.path + for data in self.zip_path(self.path, self.arc_path): + yield data yield self.archive_footer()