aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests/test_workbench.py
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2013-01-17 15:51:30 -0600
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-01-17 15:51:30 -0600
commit00cf28da215e73c494f553e7de3d21a9b63cf0cf (patch)
tree461ee702dca35ea6ffe56380286c24abe3bd155f /mediagoblin/tests/test_workbench.py
parentc813f0bd5776dde0e3c42c12b17f83f211b50e6a (diff)
parentba5ea989a5826440e8b84af8128dadd0ae252259 (diff)
downloadmediagoblin-00cf28da215e73c494f553e7de3d21a9b63cf0cf.tar.lz
mediagoblin-00cf28da215e73c494f553e7de3d21a9b63cf0cf.tar.xz
mediagoblin-00cf28da215e73c494f553e7de3d21a9b63cf0cf.zip
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/tests/test_workbench.py')
-rw-r--r--mediagoblin/tests/test_workbench.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/tests/test_workbench.py b/mediagoblin/tests/test_workbench.py
index 9da8eea0..636c8689 100644
--- a/mediagoblin/tests/test_workbench.py
+++ b/mediagoblin/tests/test_workbench.py
@@ -18,7 +18,7 @@ import os
import tempfile
-from mediagoblin import workbench
+from mediagoblin.tools import workbench
from mediagoblin.mg_globals import setup_globals
from mediagoblin.decorators import get_workbench
from mediagoblin.tests.test_storage import get_tmp_filestorage