From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Tue, 14 Jun 2011 18:01:39 +0000 (+0200)
Subject: Drop WorkbenchManager.localized_file()
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8bfa533f8b438e57a7950a8dcd02a275cbfa19df;p=mediagoblin.git

Drop WorkbenchManager.localized_file()

As Workbench has the localized_file() method, use this
everywhere and drop the wrapper method from
WorkbenchManager.

The processing code already did that.
---

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)