chrome/common/extensions/docs/server2/chained_compiled_file_system.py - Issue 437323003: Docserver: Factor SamplesModel out of SamplesDataSource

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

Issue 437323003: Docserver: Factor SamplesModel out of SamplesDataSource (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: The cron is on Created 6 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:

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

Download patch

« chrome/common/extensions/docs/server2/api_data_source.py ('K') | « chrome/common/extensions/docs/server2/caching_file_system.py ('k') | chrome/common/extensions/docs/server2/compiled_file_system.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 6fbd31e73e0c5c7cf21faab2a16a80fd8e6db09e..74e2a59a3c73286b92c1580d0ac34e9c6512c78f 100644

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

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

@@ -6,6 +6,7 @@ from compiled_file_system import CompiledFileSystem

from docs_server_utils import StringIdentity

from file_system import FileNotFoundError

from future import Future

+from path_util import ToDirectory

class ChainedCompiledFileSystem(object):

@@ -52,8 +53,7 @@ class ChainedCompiledFileSystem(object):

lambda compiled_fs: compiled_fs.GetFileVersion(path))

def GetFromFileListing(self, path):

- if not path.endswith('/'):

- path += '/'

+ path = ToDirectory(path)

return self._GetImpl(

path,

lambda compiled_fs: compiled_fs.GetFromFileListing(path),