| Index: chrome/common/extensions/docs/server2/redirector.py
|
| diff --git a/chrome/common/extensions/docs/server2/redirector.py b/chrome/common/extensions/docs/server2/redirector.py
|
| index 89053311143ed30305dba9fa04ceba4baa904e97..c97964d10c3fd5a00383e2be67ad2a1ffdf10bfc 100644
|
| --- a/chrome/common/extensions/docs/server2/redirector.py
|
| +++ b/chrome/common/extensions/docs/server2/redirector.py
|
| @@ -6,7 +6,7 @@ import posixpath
|
| from urlparse import urlsplit
|
|
|
| from file_system import FileNotFoundError
|
| -from future import Future
|
| +from future import All
|
| from path_util import Segment, Join, SplitParent
|
|
|
| class Redirector(object):
|
| @@ -108,6 +108,5 @@ class Redirector(object):
|
| futures = []
|
| for root, dirs, files in self._file_system.Walk(''):
|
| if 'redirects.json' in files:
|
| - futures.append(
|
| - self._cache.GetFromFile(posixpath.join(root, 'redirects.json')))
|
| - return Future(callback=lambda: [f.Get() for f in futures])
|
| + futures.append(self._cache.GetFromFile(Join(root, 'redirects.json')))
|
| + return All(futures)
|
|
|