heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
tilly-Q 2013-09-23 14:10:11 -04:00
parent 6483b37060
commit a523ffce3c
10 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/db/migrations.py
View File

@ -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 = {}

3
mediagoblin/db/util.py
View File

@ -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
##########################

3
mediagoblin/decorators.py
View File

@ -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 _

3
mediagoblin/moderation/tools.py
View File

@ -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)

6
mediagoblin/moderation/views.py
View File

@ -14,10 +14,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/>.
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,
active_user_from_url, user_has_privilege,
@ -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

1
mediagoblin/tests/test_api.py
View File

@ -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__)

3
mediagoblin/tests/test_moderation.py
View File

@ -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:

7
mediagoblin/tests/test_privileges.py
View File

@ -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):

2
mediagoblin/tests/test_submission.py
View File

@ -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

3
mediagoblin/user_pages/views.py
View File

@ -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