Merge remote-tracking branch 'remotes/nyergler/pep8-ification'

Conflicts:
	mediagoblin/db/migrations.py
	mediagoblin/db/models.py
	mediagoblin/user_pages/views.py
	mediagoblin/util.py

1 files changed, 5 insertions, 4 deletions

diff --git a/mediagoblin/process_media/errors.py b/mediagoblin/process_media/errors.py
index 8003ffaf..4224a3e1 100644
--- a/mediagoblin/process_media/errors.py
+++ b/mediagoblin/process_media/errors.py
@@ -16,17 +16,18 @@
 
 from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
 
+
 class BaseProcessingFail(Exception):
     """
     Base exception that all other processing failure messages should
     subclass from.
-  
+
     You shouldn't call this itself; instead you should subclass it
     and provid the exception_path and general_message applicable to
     this error.
     """
     general_message = u''
-  
+
     @property
     def exception_path(self):
         return u"%s:%s" % (
@@ -34,8 +35,8 @@ class BaseProcessingFail(Exception):
 
     def __init__(self, **metadata):
         self.metadata = metadata or {}
-  
-  
+
+
 class BadMediaFail(BaseProcessingFail):
     """
     Error that should be raised when an inappropriate file was given