9 files changed, 19 insertions, 24 deletions
diff --git a/mediagoblin/plugins/api/tools.py b/mediagoblin/plugins/api/tools.py
index 79c63435..31115119 100644
--- a/mediagoblin/plugins/api/tools.py
+++ b/mediagoblin/plugins/api/tools.py
@@ -15,11 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import logging
-import json
 
 from functools import wraps
 from werkzeug.exceptions import Forbidden
-from werkzeug.wrappers import Response
 
 from urllib.parse import urljoin
 
@@ -48,10 +46,11 @@ class Auth:
     method.
     '''
     def trigger(self, request):
-        raise NotImplemented()
+        raise NotImplementedError()
 
     def __call__(self, request, *args, **kw):
-        raise NotImplemented()
+        raise NotImplementedError()
+
 
 def get_entry_serializable(entry, urlgen):
     '''
diff --git a/mediagoblin/plugins/api/views.py b/mediagoblin/plugins/api/views.py
index 85254a8c..9da2e977 100644
--- a/mediagoblin/plugins/api/views.py
+++ b/mediagoblin/plugins/api/views.py
@@ -26,9 +26,9 @@ from mediagoblin.decorators import require_active_login
 from mediagoblin.meddleware.csrf import csrf_exempt
 from mediagoblin.media_types import FileTypeNotSupported
 from mediagoblin.plugins.api.tools import api_auth, get_entry_serializable
-from mediagoblin.submit.lib import \
-    check_file_field, submit_media, get_upload_file_limits, \
-    FileUploadLimit, UserUploadLimit, UserPastUploadLimit
+from mediagoblin.submit.lib import (
+    check_file_field, submit_media, FileUploadLimit, UserUploadLimit,
+    UserPastUploadLimit)
 
 _log = logging.getLogger(__name__)
 
diff --git a/mediagoblin/plugins/archivalook/tools.py b/mediagoblin/plugins/archivalook/tools.py
index a7d3e1f4..a9ea7846 100644
--- a/mediagoblin/plugins/archivalook/tools.py
+++ b/mediagoblin/plugins/archivalook/tools.py
@@ -13,10 +13,10 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-from mediagoblin.db.models import MediaEntry, User, LocalUser
+from mediagoblin.db.models import MediaEntry, LocalUser
 from mediagoblin.plugins.archivalook.models import FeaturedMedia
 from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
-from mediagoblin.plugins.archivalook.models import FeaturedMedia
+
 
 def get_media_entry_from_uploader_slug(uploader_username, slug):
     """
diff --git a/mediagoblin/plugins/archivalook/views.py b/mediagoblin/plugins/archivalook/views.py
index ca832a5c..f64ea7f0 100644
--- a/mediagoblin/plugins/archivalook/views.py
+++ b/mediagoblin/plugins/archivalook/views.py
@@ -31,7 +31,7 @@ from mediagoblin.plugins.archivalook.models import FeaturedMedia
 from mediagoblin.plugins.archivalook.utils import feature_template
 from mediagoblin.plugins.archivalook.tools import (promote_feature,
                                                     demote_feature)
-from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
+
 
 @user_not_banned
 def root_view(request):
@@ -126,7 +126,7 @@ def feature_media(request, media, **kwargs):
     already_featured_media_ids = [f.media_entry.id 
         for f in FeaturedMedia.query.all()]
     if not media.id in already_featured_media_ids:
-        new_feature = automatically_add_new_feature(media)
+        automatically_add_new_feature(media)
     return redirect(
         request, 'index')
 
diff --git a/mediagoblin/plugins/ldap/views.py b/mediagoblin/plugins/ldap/views.py
index 94af5465..f24c55d0 100644
--- a/mediagoblin/plugins/ldap/views.py
+++ b/mediagoblin/plugins/ldap/views.py
@@ -16,7 +16,7 @@
 
 from mediagoblin import mg_globals, messages
 from mediagoblin.auth.tools import register_user
-from mediagoblin.db.models import User, LocalUser
+from mediagoblin.db.models import LocalUser
 from mediagoblin.decorators import allow_registration, auth_enabled
 from mediagoblin.plugins.ldap import forms
 from mediagoblin.plugins.ldap.tools import LDAP
diff --git a/mediagoblin/plugins/openid/__init__.py b/mediagoblin/plugins/openid/__init__.py
index b26087a2..5566c0ce 100644
--- a/mediagoblin/plugins/openid/__init__.py
+++ b/mediagoblin/plugins/openid/__init__.py
@@ -13,8 +13,8 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 import os
-import uuid
 
 from sqlalchemy import or_
 
diff --git a/mediagoblin/plugins/piwigo/views.py b/mediagoblin/plugins/piwigo/views.py
index 5294a386..d94e197d 100644
--- a/mediagoblin/plugins/piwigo/views.py
+++ b/mediagoblin/plugins/piwigo/views.py
@@ -24,10 +24,9 @@ from mediagoblin.tools.translate import pass_to_ugettext as _
 from mediagoblin.meddleware.csrf import csrf_exempt
 from mediagoblin.auth.tools import check_login_simple
 from mediagoblin.submit.lib import \
-    submit_media, check_file_field, get_upload_file_limits, \
+    submit_media, check_file_field, \
     FileUploadLimit, UserUploadLimit, UserPastUploadLimit
 
-
 from mediagoblin.user_pages.lib import add_media_to_collection
 from mediagoblin.db.models import Collection
 
diff --git a/mediagoblin/plugins/subtitles/models.py b/mediagoblin/plugins/subtitles/models.py
index f71fb173..eb78147c 100644
--- a/mediagoblin/plugins/subtitles/models.py
+++ b/mediagoblin/plugins/subtitles/models.py
@@ -13,11 +13,12 @@
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 from sqlalchemy import Column, Integer, Unicode, ForeignKey
 from sqlalchemy.orm import relationship
 
-from mediagoblin.db.models import User
-from mediagoblin.db.base import Base,MediaEntry
+from mediagoblin.db.base import Base, MediaEntry
+
 
 class MediaSubtitleFile(Base):
     __tablename__ = "core__subtitle_files"
diff --git a/mediagoblin/plugins/subtitles/views.py b/mediagoblin/plugins/subtitles/views.py
index 75090ea0..9b05e535 100644
--- a/mediagoblin/plugins/subtitles/views.py
+++ b/mediagoblin/plugins/subtitles/views.py
@@ -16,24 +16,20 @@
 
 from datetime import datetime
 
-from itsdangerous import BadSignature
-from werkzeug.exceptions import Forbidden
 from werkzeug.utils import secure_filename
 
 from mediagoblin import messages
 from mediagoblin import mg_globals
 
 from mediagoblin.plugins.subtitles import forms
-from mediagoblin.decorators import (require_active_login, active_user_from_url,
+from mediagoblin.decorators import (require_active_login,
                             get_media_entry_by_id, user_may_delete_media)
-from mediagoblin.tools.metadata import (compact_and_validate, DEFAULT_CHECKER,
-                                        DEFAULT_SCHEMA)
 from mediagoblin.tools.response import (render_to_response,
-                                        redirect, redirect_obj, render_404)
+                                        redirect)
 
 import mimetypes
 
-from mediagoblin.plugins.subtitles.tools import open_subtitle,save_subtitle
+from mediagoblin.plugins.subtitles.tools import open_subtitle, save_subtitle
 
 UNSAFE_MIMETYPES = [
         'text/html',