This commit was solely to remove unused imports in the code that I have written

diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index ff74aa309a5c950dfa78d34c60293d0b4acfc33f..54b4adb4fdbbbc2879df441ff64fd23cdcb5ed47 100644 (file)
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -29,8 +29,7 @@ from migrate.changeset.constraint import UniqueConstraint
 from mediagoblin.db.extratypes import JSONEncoded
 from mediagoblin.db.migration_tools import RegisterMigration, inspect_table
 from mediagoblin.db.models import (MediaEntry, Collection, User,
-                                   MediaComment, Privilege, ReportBase,
-                                   FOUNDATIONS)
+                                   MediaComment, Privilege, FOUNDATIONS)
 
 MIGRATIONS = {}
 

diff --git a/mediagoblin/db/util.py b/mediagoblin/db/util.py
index 2488dcac8f87c783eafda4e69a180f05a9008391..7a0a3a73707b5330e039e3a76c78c6c45a6a73d8 100644 (file)
--- a/mediagoblin/db/util.py
+++ b/mediagoblin/db/util.py
@@ -15,8 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from mediagoblin.db.base import Session
-from mediagoblin.db.models import (MediaEntry, Tag, MediaTag, Collection, \
-                                 User, Privilege, FOUNDATIONS)
+from mediagoblin.db.models import MediaEntry, Tag, MediaTag, Collection
 
 
 ##########################

diff --git a/mediagoblin/decorators.py b/mediagoblin/decorators.py
index d0b5ad336804fcb30a2faa7ac2df3ece0b33b42d..872dc1f41fc1dab4ebeaf44c59ae676edf21f100 100644 (file)
--- a/mediagoblin/decorators.py
+++ b/mediagoblin/decorators.py
@@ -22,8 +22,7 @@ from oauthlib.oauth1 import ResourceEndpoint
 
 from mediagoblin import mg_globals as mgg
 from mediagoblin import messages
-from mediagoblin.db.models import (MediaEntry, User, MediaComment,
-                                                       UserBan, Privilege)
+from mediagoblin.db.models import MediaEntry, User, MediaComment
 from mediagoblin.tools.response import (redirect, render_404,
                                                                render_user_banned, json_response)
 from mediagoblin.tools.translate import pass_to_ugettext as _

diff --git a/mediagoblin/moderation/tools.py b/mediagoblin/moderation/tools.py
index 224a0c736719f4aa4e794659f01444daff562a61..f519e5f30af225d3aea337106fe380ab401a65d9 100644 (file)
--- a/mediagoblin/moderation/tools.py
+++ b/mediagoblin/moderation/tools.py
@@ -21,7 +21,6 @@ from mediagoblin.tools.mail import send_email
 from mediagoblin.tools.response import redirect
 from datetime import datetime
 from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
-import sys, traceback
 
 def take_punitive_actions(request, form, report, user):
     message_body =''
@@ -32,7 +31,7 @@ def take_punitive_actions(request, form, report, user):
         for privilege_name in form.take_away_privileges.data:
             take_away_privileges(user.username, privilege_name)
             form.resolution_content.data += \
-                u"\n{mod} took away {user}\'{privilege} privileges.".format(
+                u"\n{mod} took away {user}\'s {privilege} privileges.".format(
                     mod=request.user.username,
                     user=user.username,
                     privilege=privilege_name)

diff --git a/mediagoblin/moderation/views.py b/mediagoblin/moderation/views.py
index 4721834a395a0b3abf901a2b29420589fb933002..f4de11ad8a4d0f6677bcf6a1e5f240150318fa76 100644 (file)
--- a/mediagoblin/moderation/views.py
+++ b/mediagoblin/moderation/views.py
@@ -14,12 +14,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 werkzeug.exceptions import Forbidden
 
-from mediagoblin.db.models import (MediaEntry, User, MediaComment, \
-                                   CommentReport, ReportBase, Privilege, \
+from mediagoblin.db.models import (MediaEntry, User,ReportBase, Privilege,
                                    UserBan)
-from mediagoblin.decorators import (require_admin_or_moderator_login, 
+from mediagoblin.decorators import (require_admin_or_moderator_login,
                                     active_user_from_url, user_has_privilege,
                                     allow_reporting)
 from mediagoblin.tools.response import render_to_response, redirect
@@ -27,8 +25,6 @@ from mediagoblin.moderation import forms as moderation_forms
 from mediagoblin.moderation.tools import (take_punitive_actions, \
     take_away_privileges, give_privileges, ban_user, unban_user, \
     parse_report_panel_settings)
-from werkzeug.datastructures import ImmutableMultiDict
-from datetime import datetime
 from math import ceil
 
 @require_admin_or_moderator_login

diff --git a/mediagoblin/tests/test_api.py b/mediagoblin/tests/test_api.py
index eb9c0fd450400cd64052b0c878574707d3a7bf14..4e0cbd8fbdcbf33f693a6667c31d75937a2ff1ca 100644 (file)
--- a/mediagoblin/tests/test_api.py
+++ b/mediagoblin/tests/test_api.py
@@ -25,7 +25,6 @@ from mediagoblin.tools import template, pluginapi
 from mediagoblin.tests.tools import fixture_add_user
 from .resources import GOOD_JPG, GOOD_PNG, EVIL_FILE, EVIL_JPG, EVIL_PNG, \
     BIG_BLUE
-from mediagoblin.db.models import Privilege
 
 
 _log = logging.getLogger(__name__)

diff --git a/mediagoblin/tests/test_moderation.py b/mediagoblin/tests/test_moderation.py
index 8de76e446b35510e2a460a7617314ce408116e90..e7a0ebef6e2e1fccc0d89397b0494dc645ee32fa 100644 (file)
--- a/mediagoblin/tests/test_moderation.py
+++ b/mediagoblin/tests/test_moderation.py
@@ -19,10 +19,7 @@ import pytest
 from mediagoblin.tests.tools import (fixture_add_user,
             fixture_add_comment_report, fixture_add_comment)
 from mediagoblin.db.models import User, CommentReport, MediaComment, UserBan
-from mediagoblin.moderation.tools import take_away_privileges, give_privileges
 from mediagoblin.tools import template, mail
-from datetime import date, timedelta
-
 from webtest import AppError
 
 class TestModerationViews:

diff --git a/mediagoblin/tests/test_privileges.py b/mediagoblin/tests/test_privileges.py
index 9ae523f8e8f73706fb56dd6e24b969ffeb4932c8..05829b3497552b8aca304802391ab29db7cbb000 100644 (file)
--- a/mediagoblin/tests/test_privileges.py
+++ b/mediagoblin/tests/test_privileges.py
@@ -20,8 +20,7 @@ from webtest import AppError
 
 from mediagoblin.tests.tools import fixture_add_user, fixture_media_entry
 
-from mediagoblin.db.models import User, Privilege, UserBan
-from mediagoblin.db.base import Session
+from mediagoblin.db.models import User, UserBan
 from mediagoblin.tools import template
 
 from .resources import GOOD_JPG
@@ -34,7 +33,7 @@ class TestPrivilegeFunctionality:
 
         fixture_add_user(u'alex',
             privileges=[u'admin',u'active'])
-        fixture_add_user(u'raven',
+        fixture_add_user(u'meow',
             privileges=[u'moderator',u'active',u'reporter'])
         fixture_add_user(u'natalie',
             privileges=[u'active'])
@@ -65,7 +64,7 @@ class TestPrivilegeFunctionality:
 
     def query_for_users(self):
         self.admin_user = User.query.filter(User.username==u'alex').first()
-        self.mod_user = User.query.filter(User.username==u'raven').first()
+        self.mod_user = User.query.filter(User.username==u'meow').first()
         self.user = User.query.filter(User.username==u'natalie').first()
 
     def testUserBanned(self):

diff --git a/mediagoblin/tests/test_submission.py b/mediagoblin/tests/test_submission.py
index d8cb982711df9f67b636e089c70ddc0a58442d91..14766c506cc7d881fa1c952982adcfb6948fd1f1 100644 (file)
--- a/mediagoblin/tests/test_submission.py
+++ b/mediagoblin/tests/test_submission.py
@@ -24,7 +24,7 @@ import pytest
 
 from mediagoblin.tests.tools import fixture_add_user
 from mediagoblin import mg_globals
-from mediagoblin.db.models import MediaEntry, User, Privilege
+from mediagoblin.db.models import MediaEntry, User
 from mediagoblin.tools import template
 from mediagoblin.media_types.image import ImageMediaManager
 from mediagoblin.media_types.pdf.processing import check_prerequisites as pdf_check_prerequisites

diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py
index e895e63489ea860004c9bcaeaa3519bf150b67ca..020fa6a80fe470504e9b22a972a09c256341874d 100644 (file)
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -20,8 +20,7 @@ import json
 
 from mediagoblin import messages, mg_globals
 from mediagoblin.db.models import (MediaEntry, MediaTag, Collection,
-                                   CollectionItem, User, MediaComment,
-                                   CommentReport, MediaReport)
+                                   CollectionItem, User)
 from mediagoblin.tools.response import render_to_response, render_404, \
     redirect, redirect_obj
 from mediagoblin.tools.text import cleaned_markdown_conversion