Extensions Docs Server: Fix zipper

chrome/common/extensions/docs/server2/example_zipper.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 from io import BytesIO
 import re
 from zipfile import ZipFile
 
 class ExampleZipper(object):
   """This class creates a zip file given a samples directory.
   """
   def __init__(self, file_system, cache_builder, base_path, match_path):
     self._base_path = base_path
     self._zip_cache = cache_builder.build(self._MakeZipFile)
     self._file_system = file_system
     self._match_path = match_path
 
   def _MakeZipFile(self, files):
     zip_path = os.path.commonprefix(files).rsplit('/', 1)[-2]
     prefix = zip_path.rsplit('/', 1)[-2]
     if zip_path + '/manifest.json' not in files:
       return None
     zip_bytes = BytesIO()
     zip_file = ZipFile(zip_bytes, mode='w')
     try:
-      for filename, contents in self._file_system.Read(files).Get().iteritems():
-        zip_file.writestr(filename[len(prefix):].strip('/'), contents)
+      for name, file_ in self._file_system.Read(files, False).Get().iteritems():

[not at google - send to devlin, 2012/07/27 04:54:36]

name to optional arguments plz

Read(files, binary=True)

also I preferred the old way of having "contents" in the name; makes it clear
that it's the file's contents not its handle. Maybe "file_contents"?

[cduvall, 2012/07/27 18:12:28]

Done.

+        zip_file.writestr(name[len(prefix):].strip('/'), file_)
     finally:
       zip_file.close()
     return zip_bytes.getvalue()
 
   def Create(self, path):
     """ Creates a new zip file from the recursive contents of |path|
     as returned by |_zip_cache|.
     Paths within the zip file are given relative to and including |path|.
     """
     return self._zip_cache.GetFromFileListing(
         self._base_path + '/' + path)