Feature #571 - Closing storage objects - Removed closing(), renamed

[mediagoblin.git] / mediagoblin / process_media / __init__.py

diff --git a/mediagoblin/process_media/__init__.py b/mediagoblin/process_media/__init__.py
index e1289a4c861b626841497286645447781a287d32..2b9eed6e111a051afe1001262caa85c17305a9c7 100644 (file)
--- a/mediagoblin/process_media/__init__.py
+++ b/mediagoblin/process_media/__init__.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -16,7 +16,6 @@
 
 import Image
 
-from contextlib import contextmanager
 from celery.task import Task
 from celery import registry
 
@@ -36,14 +35,6 @@ def create_pub_filepath(entry, filename):
              filename])
 
 
-@contextmanager
-def closing(callback):
-    try:
-        yield callback
-    finally:
-        pass
-
-
 ################################
 # Media processing initial steps
 ################################
@@ -66,7 +57,7 @@ class ProcessMedia(Task):
         except BaseProcessingFail, exc:
             mark_entry_failed(entry[u'_id'], exc)
             return
-            
+
         entry['state'] = u'processed'
         entry.save()
 
@@ -142,9 +133,9 @@ def process_image(entry):
         thumb = thumb.convert("RGB")
 
     thumb_filepath = create_pub_filepath(entry, 'thumbnail.jpg')
-
     thumb_file = mgg.public_store.get_file(thumb_filepath, 'w')
-    with closing(thumb_file):
+
+    with thumb_file:
         thumb.save(thumb_file, "JPEG", quality=90)
 
     # If the size of the original file exceeds the specified size of a `medium`
@@ -160,9 +151,9 @@ def process_image(entry):
             medium = medium.convert("RGB")
 
         medium_filepath = create_pub_filepath(entry, 'medium.jpg')
-
         medium_file = mgg.public_store.get_file(medium_filepath, 'w')
-        with closing(medium_file):
+
+        with medium_file:
             medium.save(medium_file, "JPEG", quality=90)
             medium_processed = True
 
@@ -172,8 +163,8 @@ def process_image(entry):
 
     with queued_file:
         original_filepath = create_pub_filepath(entry, queued_filepath[-1])
-        
-        with closing(mgg.public_store.get_file(original_filepath, 'wb')) as original_file:
+
+        with mgg.public_store.get_file(original_filepath, 'wb') as original_file:
             original_file.write(queued_file.read())
 
     mgg.queue_store.delete_file(queued_filepath)