summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions/docs/server2/file_system_util.py
diff options
context:
space:
mode:
authorjaredshumway94@gmail.com <jaredshumway94@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-31 09:31:35 +0000
committerjaredshumway94@gmail.com <jaredshumway94@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-31 09:31:35 +0000
commit796b80d1899945b3ec11b4df3414277cae8d9edd (patch)
tree8b38cc552b4df43405c63e22c8aa8306d6b9ff80 /chrome/common/extensions/docs/server2/file_system_util.py
parent3db1ff21230fc2d6e0f2d6e11137ee0c35f56f1b (diff)
downloadchromium_src-796b80d1899945b3ec11b4df3414277cae8d9edd.zip
chromium_src-796b80d1899945b3ec11b4df3414277cae8d9edd.tar.gz
chromium_src-796b80d1899945b3ec11b4df3414277cae8d9edd.tar.bz2
Docserver remove CompliedFileSystem.CreateIdentity
Use FileSystem instead. FileSystem.Walk has been changed such that |root| in the returned tuple is relative to the path given to Walk. BUG=265692 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/20990004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214652 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/docs/server2/file_system_util.py')
-rw-r--r--chrome/common/extensions/docs/server2/file_system_util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/common/extensions/docs/server2/file_system_util.py b/chrome/common/extensions/docs/server2/file_system_util.py
index 4431e58..0882564 100644
--- a/chrome/common/extensions/docs/server2/file_system_util.py
+++ b/chrome/common/extensions/docs/server2/file_system_util.py
@@ -10,5 +10,5 @@ def CreateURLsFromPaths(file_system, directory, urlprefix):
'''
for root, _, files in file_system.Walk(directory):
for f in files:
- url = posixpath.join(urlprefix, root[len(directory) + 1:], f)
- yield url, '%s/%s' % (root, f)
+ url = posixpath.join(urlprefix, root, f)
+ yield url, posixpath.join(directory, root, f)