Extensions Docs Server: Uniform handling of file not found errors

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

Index: chrome/common/extensions/docs/server2/intro_data_source.py
diff --git a/chrome/common/extensions/docs/server2/intro_data_source.py b/chrome/common/extensions/docs/server2/intro_data_source.py
index c2563527b81cde4c775fc314e6989d6aa367eed1..ff983d53e20427230ad7ef0e8bf4984965e0e185 100644
--- a/chrome/common/extensions/docs/server2/intro_data_source.py
+++ b/chrome/common/extensions/docs/server2/intro_data_source.py
@@ -6,6 +6,7 @@ from HTMLParser import HTMLParser
 import re
 
 from docs_server_utils import FormatKey
+from file_system import FileNotFoundError
 from third_party.handlebar import Handlebar
 
 class _IntroParser(HTMLParser):
@@ -77,6 +78,6 @@ class IntroDataSource(object):
     for base_path in self._base_paths:
       try:
         return self._cache.GetFromFile(base_path + '/' + real_path)
-      except Exception:
+      except FileNotFoundError:
         pass
     return None

[not at google - send to devlin, 2012/08/10 06:12:16]

log error before returning None?

[cduvall, 2012/08/10 17:25:16]

Done.

[not at google - send to devlin, 2012/08/12 22:22:58]

Like ApiListDataSource, this should only be happening if we make a mistake
writing the templates. So rather than logging and returning None, throw a
ValueError if it isn't found?

Btw by "logging error" here I mean like logging.error("No intro found"). Logging
the last error might be misleading.

... though should raise ValueError("No intro found for \"%s\"" % key) anyway.

[cduvall, 2012/08/13 18:44:05]

Done.