Extensions Docs Server: Fix zipper

chrome/common/extensions/docs/server2/local_file_system.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
 
 import file_system
 from future import Future
 
 class LocalFileSystem(file_system.FileSystem):
   """FileSystem implementation which fetches resources from the local
   filesystem.
   """
   def __init__(self, base_path):
     self._base_path = self._ConvertToFilepath(base_path)
 
   def _ConvertToFilepath(self, path):
     return path.replace('/', os.sep)
 
-  def _ReadFile(self, filename):
+  def _ReadFile(self, filename, process):
     with open(os.path.join(self._base_path, filename), 'r') as f:
-      return file_system._ProcessFileData(f.read(), filename)
+      if process:

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

Safer to make it clear that f is only being read once by assigning to variable
first.

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

Done.

+        return file_system._ProcessFileData(f.read(), filename)
+      return f.read()
 
   def _ListDir(self, dir_name):
     all_files = []
     full_path = os.path.join(self._base_path, dir_name)
     for path in os.listdir(full_path):
       if path.startswith('.'):
         continue
       if os.path.isdir(os.path.join(full_path, path)):
         all_files.append(path + '/')
       else:
         all_files.append(path)
     return all_files
 
-  def Read(self, paths):
+  def Read(self, paths, process=True):
     result = {}
     for path in paths:
       if path.endswith('/'):
         result[path] = self._ListDir(self._ConvertToFilepath(path))
       else:
-        result[path] = self._ReadFile(self._ConvertToFilepath(path))
+        result[path] = self._ReadFile(self._ConvertToFilepath(path), process)
     return Future(value=result)
 
   def Stat(self, path):
     return self.StatInfo(os.stat(os.path.join(self._base_path, path)).st_mtime)