Chromium Code Reviews| Index: chrome/common/extensions/docs/server2/server_instance.py |
| diff --git a/chrome/common/extensions/docs/server2/server_instance.py b/chrome/common/extensions/docs/server2/server_instance.py |
| index 647af069be6350514b57f716fd2a4b5dba50a1fd..c1eb21333195d8139233aa15d7358d2fc65163fb 100644 |
| --- a/chrome/common/extensions/docs/server2/server_instance.py |
| +++ b/chrome/common/extensions/docs/server2/server_instance.py |
| @@ -2,37 +2,24 @@ |
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| -from fnmatch import fnmatch |
| -import logging |
| -import mimetypes |
| -import traceback |
| -import os |
| - |
| from api_data_source import APIDataSource |
| from api_list_data_source import APIListDataSource |
| -from appengine_url_fetcher import AppEngineUrlFetcher |
| -from appengine_wrappers import GetAppVersion, IsDevServer |
| -from branch_utility import BranchUtility |
| +from appengine_wrappers import IsDevServer |
| from caching_file_system import CachingFileSystem |
| from compiled_file_system import CompiledFileSystem |
| from empty_dir_file_system import EmptyDirFileSystem |
| from example_zipper import ExampleZipper |
| -from file_system import FileNotFoundError |
| -from github_file_system import GithubFileSystem |
| from intro_data_source import IntroDataSource |
| from local_file_system import LocalFileSystem |
| +from manifest_data_source import ManifestDataSource |
| from object_store_creator import ObjectStoreCreator |
| -from offline_file_system import OfflineFileSystem |
| from path_canonicalizer import PathCanonicalizer |
| from reference_resolver import ReferenceResolver |
| from samples_data_source import SamplesDataSource |
| from sidenav_data_source import SidenavDataSource |
| -from subversion_file_system import SubversionFileSystem |
| import svn_constants |
| from template_data_source import TemplateDataSource |
| from test_object_store import TestObjectStore |
| -from third_party.json_schema_compiler.model import UnixName |
| -import url_constants |
| class ServerInstance(object): |
| def __init__(self, |
| @@ -97,6 +84,12 @@ class ServerInstance(object): |
| self.compiled_host_fs_factory, |
| svn_constants.JSON_PATH) |
| + self.manifest_data_source = ManifestDataSource( |
| + self.compiled_host_fs_factory, |
| + LocalFileSystem.Create(), |
|
not at google - send to devlin
2013/05/12 04:20:05
sorry for not picking this up, but this should be
|
| + '/'.join((svn_constants.JSON_PATH, 'manifest.json')), |
| + '/'.join((svn_constants.API_PATH, '_manifest_features.json'))) |
| + |
| self.template_data_source_factory = TemplateDataSource.Factory( |
| channel, |
| self.api_data_source_factory, |
| @@ -106,6 +99,7 @@ class ServerInstance(object): |
| self.sidenav_data_source_factory, |
| self.compiled_host_fs_factory, |
| self.ref_resolver_factory, |
| + self.manifest_data_source, |
| svn_constants.PUBLIC_TEMPLATE_PATH, |
| svn_constants.PRIVATE_TEMPLATE_PATH) |