aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/tests/test_workbench.py11
-rw-r--r--mediagoblin/workbench.py3
2 files changed, 5 insertions, 9 deletions
diff --git a/mediagoblin/tests/test_workbench.py b/mediagoblin/tests/test_workbench.py
index 2795cd63..db27dfc6 100644
--- a/mediagoblin/tests/test_workbench.py
+++ b/mediagoblin/tests/test_workbench.py
@@ -83,20 +83,19 @@ class TestWorkbench(object):
with this_storage.get_file(filepath, 'w') as our_file:
our_file.write('Our file')
- filename = self.workbench_manager.localized_file(
- this_workbench, this_storage, filepath)
+ filename = this_workbench.localized_file(this_storage, filepath)
assert filename == os.path.join(
this_workbench.dir, 'ourfile.txt')
# fake remote file storage, filename_if_copying set
- filename = self.workbench_manager.localized_file(
- this_workbench, this_storage, filepath, 'thisfile')
+ filename = this_workbench.localized_file(
+ this_storage, filepath, 'thisfile')
assert filename == os.path.join(
this_workbench.dir, 'thisfile.txt')
# fake remote file storage, filename_if_copying set,
# keep_extension_if_copying set to false
- filename = self.workbench_manager.localized_file(
- this_workbench, this_storage, filepath, 'thisfile.text', False)
+ filename = this_workbench.localized_file(
+ this_storage, filepath, 'thisfile.text', False)
assert filename == os.path.join(
this_workbench.dir, 'thisfile.text')
diff --git a/mediagoblin/workbench.py b/mediagoblin/workbench.py
index c88b686c..32229d2e 100644
--- a/mediagoblin/workbench.py
+++ b/mediagoblin/workbench.py
@@ -151,6 +151,3 @@ class WorkbenchManager(object):
"Can't destroy workbench outside the base workbench dir")
shutil.rmtree(workbench)
-
- def localized_file(self, workbench, *args, **kwargs):
- return workbench.localized_file(*args, **kwargs)