Extensions Docs Server: Fix handling of nodocs

chrome/common/extensions/docs/server2/api_data_source.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 json
 import logging
 import os
 
 from handlebar_dict_generator import HandlebarDictGenerator
+from handlebar_dict_generator import NoDocError
 import third_party.json_schema_compiler.json_comment_eater as json_comment_eater
 import third_party.json_schema_compiler.model as model
 import third_party.json_schema_compiler.idl_schema as idl_schema
 import third_party.json_schema_compiler.idl_parser as idl_parser
 
 class APIDataSource(object):
   """This class fetches and loads JSON APIs from the FileSystem passed in with
   |cache_builder|, so the APIs can be plugged into templates.
   """
   class Factory(object):
@@ skipping 63 matching lines @@
 
   def get(self, key):
     path, ext = os.path.splitext(key)
     unix_name = model.UnixName(path)
     json_path = unix_name + '.json'
     idl_path = unix_name + '.idl'
     try:
       return self._GenerateHandlebarContext(key,
           self._json_cache.GetFromFile(self._base_path + '/' + json_path),
           path)
-    except OSError:
+    except NoDocError:
+      raise
+    except Exception:

[not at google - send to devlin, 2012/08/09 05:11:36]

why did you change these from OSError to Exception? Exception will catch
programming errors, which we don't want to do. The only thing we should catch is
file errors like OSError.

(come to think of it, we should make sure that the various FileSystem classes
agree on what happens if a file isn't found... throw the same kind of exception,
return None, whatever)

In any case, see comment in handlebar_dict_generator.py. Shouldn't have a
NoDocError.

[cduvall, 2012/08/09 17:54:05]

Yeah, I agree that the FileSystems should all behave the same if a file isn't
found. I'll do this in a separate patch and make a bug.

I had changed this to Exception because I don't believe the SubversionFileSystem
will throw an OSError when a file isn't found, so I was worried about that
exception not getting caught.

Bug here: http://crbug.com/141664

       try:
         return self._GenerateHandlebarContext(key,
             self._idl_cache.GetFromFile(self._base_path + '/' + idl_path),
             path)
-      except OSError as e:
+      except Exception as e:
         raise