Extensions Docs Server: Fix handling of nodocs

chrome/common/extensions/docs/server2/template_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 logging
 
 from docs_server_utils import FormatKey
 from third_party.handlebar import Handlebar
+from handlebar_dict_generator import NoDocError
 
 EXTENSIONS_URL = '/chrome/extensions'
 
 def _MakeBranchDict(branch):
   return {
     'showWarning': branch != 'stable',
     'branches': [
       { 'name': 'Stable', 'path': 'stable' },
       { 'name': 'Dev',    'path': 'dev' },
       { 'name': 'Beta',   'path': 'beta' },
@@ skipping 77 matching lines @@
 
   def Render(self, template_name):
     """This method will render a template named |template_name|, fetching all
     the partial templates needed from |self._cache|. Partials are retrieved
     from the TemplateDataSource with the |get| method.
     """
     template = self.GetTemplate(self._public_template_path, template_name)
     if not template:
       return ''
       # TODO error handling
-    return template.render({
-      'api_list': self._api_list_data_source,
-      'apis': self._api_data_source,
-      'branchInfo': self._branch_info,
-      'intros': self._intro_data_source,
-      'partials': self,
-      'samples': self._samples_data_source,
-      'static': self._static_resources,
-      'true': True,
-      'false': False
-    }).text
+    try:
+      return template.render({
+        'api_list': self._api_list_data_source,
+        'apis': self._api_data_source,
+        'branchInfo': self._branch_info,
+        'intros': self._intro_data_source,
+        'partials': self,
+        'samples': self._samples_data_source,
+        'static': self._static_resources,
+        'true': True,
+        'false': False
+      }).text
+    except NoDocError:
+      return ''

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

See comment in handlebar_dict_generator.py. This file shouldn't need to change.

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

Done.

 
   def __getitem__(self, key):
     return self.get(key)
 
   def get(self, key):
     return self.GetTemplate(self._private_template_path, key)
 
   def GetTemplate(self, base_path, template_name):
     real_path = FormatKey(template_name)
     try:
       return self._cache.GetFromFile(base_path + '/' + real_path)
     except Exception as e:
       logging.error(e)
       return None