chrome/common/extensions/docs/server2/api_data_source.py - Issue 10828042: Extensions Docs Server: Integration testing

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/common/extensions/docs/server2/api_data_source.py

Issue 10828042: Extensions Docs Server: Integration testing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Moved logic into server instance Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 import json	5 import json

6 import logging	6 import logging

7 import os	7 import os

8	8

9 from handlebar_dict_generator import HandlebarDictGenerator	9 from handlebar_dict_generator import HandlebarDictGenerator

10 import third_party.json_schema_compiler.json_comment_eater as json_comment_eater	10 import third_party.json_schema_compiler.json_comment_eater as json_comment_eater

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
64 idl_path = unix_name + '.idl'	64 idl_path = unix_name + '.idl'

65 try:	65 try:

66 return self._AddPermissionsDict(self._json_cache.GetFromFile(	66 return self._AddPermissionsDict(self._json_cache.GetFromFile(

67 self._base_path + '/' + json_path), path)	67 self._base_path + '/' + json_path), path)

68 except Exception:	68 except Exception:

69 try:	69 try:

70 return self._AddPermissionsDict(self._idl_cache.GetFromFile(	70 return self._AddPermissionsDict(self._idl_cache.GetFromFile(

71 self._base_path + '/' + idl_path), path)	71 self._base_path + '/' + idl_path), path)

72 except Exception as e:	72 except Exception as e:

73 logging.warn(e)	73 logging.warn(e)

74 return None	74 raise

OLD	NEW