chrome/common/extensions/docs/server2/instance_servlet.py - Issue 18323018: Linking AvailabilityFinder with APIDataSource and intro-table templates.

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

Unified Diff: chrome/common/extensions/docs/server2/instance_servlet.py

Issue 18323018: Linking AvailabilityFinder with APIDataSource and intro-table templates. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 6 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:

View side-by-side diff with in-line comments

Download patch

« chrome/common/extensions/docs/server2/cron_servlet.py ('K') | « chrome/common/extensions/docs/server2/fake_fetchers.py ('k') | chrome/common/extensions/docs/server2/intro_data_source_test.py » ('j') | chrome/common/extensions/docs/server2/server_instance.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/docs/server2/instance_servlet.py

diff --git a/chrome/common/extensions/docs/server2/instance_servlet.py b/chrome/common/extensions/docs/server2/instance_servlet.py

index 11848f549ff31199cc8ad086bd9bedc296dd4854..b7889819e22156ec9fd2156c6258f01a1419692a 100644

--- a/chrome/common/extensions/docs/server2/instance_servlet.py

+++ b/chrome/common/extensions/docs/server2/instance_servlet.py

@@ -37,13 +37,18 @@ class _OfflineRenderServletDelegate(RenderServlet.Delegate):

@memoize

def CreateServerInstanceForChannel(self, channel):

object_store_creator = ObjectStoreCreator(channel, start_empty=False)

- branch = (self._delegate.CreateBranchUtility(object_store_creator)

- .GetChannelInfo(channel).branch)

+ branch_utility = self._delegate.CreateBranchUtility(object_store_creator)

+ branch = branch_utility.GetChannelInfo(channel).branch

host_file_system = CachingFileSystem(

OfflineFileSystem(self._delegate.CreateHostFileSystemForBranch(branch)),

object_store_creator)

app_samples_file_system = self._delegate.CreateAppSamplesFileSystem(

object_store_creator)

+ def create_file_system(version):

+ return CachingFileSystem(

+ OfflineFileSystem(self._delegate.CreateHostFileSystemForBranch(

not at google - send to devlin 2013/07/03 19:54:56 HostFileSystemCreator would need an offline= flag

epeterson 2013/07/09 20:51:18 Done.

+ branch_utility.GetBranchForVersion(version))),

+ object_store_creator)

compiled_host_fs_factory = CompiledFileSystem.Factory(

host_file_system,

object_store_creator)

@@ -52,7 +57,9 @@ class _OfflineRenderServletDelegate(RenderServlet.Delegate):

host_file_system,

app_samples_file_system,

'' if channel == 'stable' else '/%s' % channel,

- compiled_host_fs_factory)

+ compiled_host_fs_factory,

+ branch_utility,

+ create_file_system)

class InstanceServlet(object):

'''Servlet for running on normal AppEngine instances.