diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2014-05-13 15:24:59 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2014-05-13 15:24:59 -0400 |
| commit | 1d09e8b4f1be938a3415329f4fd93e4f6936b16a (patch) | |
| tree | b14feac978e2bbd2eb9f79a81ce220cf51356f76 /mediagoblin/tools/metadata.py | |
| parent | b5dd2459893fd1e7ae1376a7573a36bf15c983f7 (diff) | |
| parent | cc7c9091acf4103d5a0e9a910eeb07bfb01b2916 (diff) | |
| download | mediagoblin-1d09e8b4f1be938a3415329f4fd93e4f6936b16a.tar.lz mediagoblin-1d09e8b4f1be938a3415329f4fd93e4f6936b16a.tar.xz mediagoblin-1d09e8b4f1be938a3415329f4fd93e4f6936b16a.zip | |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin into metadata
Conflicts:
mediagoblin/gmg_commands/__init__.py
Diffstat (limited to 'mediagoblin/tools/metadata.py')
| -rw-r--r-- | mediagoblin/tools/metadata.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/tools/metadata.py b/mediagoblin/tools/metadata.py index 3f10e9d1..b0cad9da 100644 --- a/mediagoblin/tools/metadata.py +++ b/mediagoblin/tools/metadata.py @@ -131,7 +131,7 @@ def load_context(url): stores internally, load them from disk. """ if url in _CONTEXT_CACHE: - return _CONTEXT_CACHE[url] + return _CONTEXT_CACHE[url] # See if it's one of our basic ones document = BUILTIN_CONTEXTS.get(url, None) |