Whitespace and formatting cleanup.

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

diff --git a/mediagoblin/process_media/__init__.py b/mediagoblin/process_media/__init__.py
index e1289a4c861b626841497286645447781a287d32..9a7d5c39b8b64d8cf6c119ca40d62d7648352a2f 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()
 
@@ -74,9 +65,10 @@ class ProcessMedia(Task):
         """
         If the processing failed we should mark that in the database.
 
-        Assuming that the exception raised is a subclass of BaseProcessingFail,
-        we can use that to get more information about the failure and store that
-        for conveying information to users about the failure, etc.
+        Assuming that the exception raised is a subclass of
+        BaseProcessingFail, we can use that to get more information
+        about the failure and store that for conveying information to
+        users about the failure, etc.
         """
         entry_id = args[0]
         mark_entry_failed(entry_id, exc)
@@ -89,10 +81,10 @@ def mark_entry_failed(entry_id, exc):
     """
     Mark a media entry as having failed in its conversion.
 
-    Uses the exception that was raised to mark more information.  If the
-    exception is a derivative of BaseProcessingFail then we can store extra
-    information that can be useful for users telling them why their media failed
-    to process.
+    Uses the exception that was raised to mark more information.  If
+    the exception is a derivative of BaseProcessingFail then we can
+    store extra information that can be useful for users telling them
+    why their media failed to process.
 
     Args:
      - entry_id: The id of the media entry
@@ -142,9 +134,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 +152,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 +164,9 @@ 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)