| 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 379cf98594999e13fd8381b6c252fbc8709c6076..6290f1894610fff4f44e8e56b4691f5189df17f7 100644
|
| --- a/chrome/common/extensions/docs/server2/server_instance.py
|
| +++ b/chrome/common/extensions/docs/server2/server_instance.py
|
| @@ -2,27 +2,17 @@
|
| # 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 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 appengine_wrappers import IsDevServer
|
| from availability_finder import AvailabilityFinder
|
| -from branch_utility import BranchUtility
|
| -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 manifest_data_source import ManifestDataSource
|
| from host_file_system_creator import HostFileSystemCreator
|
| from intro_data_source import IntroDataSource
|
| from object_store_creator import ObjectStoreCreator
|
| -from offline_file_system import OfflineFileSystem
|
| from path_canonicalizer import PathCanonicalizer
|
| from redirector import Redirector
|
| from reference_resolver import ReferenceResolver
|
| @@ -32,8 +22,6 @@ import svn_constants
|
| from template_data_source import TemplateDataSource
|
| from test_branch_utility import TestBranchUtility
|
| from test_object_store import TestObjectStore
|
| -from third_party.json_schema_compiler.model import UnixName
|
| -import url_constants
|
|
|
| class ServerInstance(object):
|
| def __init__(self,
|
| @@ -106,6 +94,12 @@ class ServerInstance(object):
|
| self.compiled_host_fs_factory,
|
| svn_constants.JSON_PATH)
|
|
|
| + self.manifest_data_source = ManifestDataSource(
|
| + self.compiled_host_fs_factory,
|
| + host_file_system,
|
| + '/'.join((svn_constants.JSON_PATH, 'manifest.json')),
|
| + '/'.join((svn_constants.API_PATH, '_manifest_features.json')))
|
| +
|
| self.template_data_source_factory = TemplateDataSource.Factory(
|
| self.api_data_source_factory,
|
| self.api_list_data_source_factory,
|
| @@ -114,6 +108,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,
|
| base_path)
|
|
|