chrome/common/extensions/docs/server2/chroot_file_system.py - Issue 417163004: Docserver: Update Future.Then() to be more Promise-like

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/chroot_file_system.py

Issue 417163004: Docserver: Update Future.Then() to be more Promise-like (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « chrome/common/extensions/docs/server2/caching_file_system.py ('k') | chrome/common/extensions/docs/server2/fake_url_fetcher.py » ('j') | chrome/common/extensions/docs/server2/future.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index af521d8ebd45cc7fcdd2e3e9e0e5021f65a7c07e..2ed612f13f8fb2f5ef3123e87e093b1d0243938a 100644

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

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

@@ -32,13 +32,11 @@ class ChrootFileSystem(FileSystem):

prefixed = posixpath.join(self._root, path)

prefixed_paths[prefixed] = path

return prefixed

- future_result = self._file_system.Read(

- tuple(prefix(path) for path in paths),

- skip_not_found=skip_not_found)

- def resolve():

+ def next(results):

return dict((prefixed_paths[path], content)

- for path, content in future_result.Get().iteritems())

- return Future(callback=resolve)

+ for path, content in results.iteritems())

+ return self._file_system.Read(tuple(prefix(path) for path in paths),

+ skip_not_found-skip_not_found).Then(next)

def Refresh(self):

return self._file_system.Refresh()