From a87727d9c84ad4f9f08a047541bbe6c44c988751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Heggest=C3=B8yl?= Date: Sun, 15 Oct 2017 18:46:04 +0200 Subject: [PATCH] Remove unused local variables Remove local variables that were assigned to but never used. --- mediagoblin/db/base.py | 2 +- mediagoblin/db/migrations.py | 10 ++++------ mediagoblin/media_types/audio/__init__.py | 2 +- mediagoblin/media_types/audio/spectrogram.py | 1 - mediagoblin/media_types/blog/__init__.py | 1 - mediagoblin/media_types/blog/views.py | 2 -- mediagoblin/moderation/views.py | 4 ---- mediagoblin/plugins/archivalook/views.py | 2 +- mediagoblin/plugins/basic_auth/__init__.py | 2 -- mediagoblin/plugins/geolocation/__init__.py | 2 -- mediagoblin/plugins/ldap/__init__.py | 2 -- mediagoblin/plugins/openid/__init__.py | 2 -- mediagoblin/plugins/persona/__init__.py | 2 -- mediagoblin/processing/task.py | 2 +- mediagoblin/tests/test_api.py | 4 +--- mediagoblin/tests/test_collections.py | 2 +- mediagoblin/tests/test_edit.py | 2 +- mediagoblin/tests/test_notifications.py | 2 -- mediagoblin/tests/test_openid.py | 5 ++--- mediagoblin/tests/test_privileges.py | 1 - mediagoblin/tests/test_reporting.py | 2 -- mediagoblin/tests/test_sql_migrations.py | 25 ++++++++++--------------- mediagoblin/tests/test_storage.py | 3 +-- mediagoblin/tests/test_video.py | 6 +++--- mediagoblin/user_pages/views.py | 1 - 25 files changed, 27 insertions(+), 62 deletions(-) diff --git a/mediagoblin/db/base.py b/mediagoblin/db/base.py index c59b0ebf..c989d74f 100644 --- a/mediagoblin/db/base.py +++ b/mediagoblin/db/base.py @@ -170,7 +170,7 @@ class GMGTableBase(object): # There will be a lot of places where the GenericForeignKey will point # to the model, we want to remap those to our tombstone. - gmrs = GenericModelReference.query.filter_by( + GenericModelReference.query.filter_by( obj_pk=self.id, model_type=self.__tablename__ ).update({ diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py index 55d64294..89676c0a 100644 --- a/mediagoblin/db/migrations.py +++ b/mediagoblin/db/migrations.py @@ -376,9 +376,9 @@ class ProcessingNotification_v0(Notification_v0): def add_new_notification_tables(db): metadata = MetaData(bind=db.bind) - user_table = inspect_table(metadata, 'core__users') - mediaentry_table = inspect_table(metadata, 'core__media_entries') - mediacomment_table = inspect_table(metadata, 'core__media_comments') + inspect_table(metadata, 'core__users') + inspect_table(metadata, 'core__media_entries') + inspect_table(metadata, 'core__media_comments') CommentSubscription_v0.__table__.create(db.bind) @@ -1702,7 +1702,7 @@ def federation_collection_schema(db): metadata = MetaData(bind=db.bind) collection_table = inspect_table(metadata, "core__collections") collection_items_table = inspect_table(metadata, "core__collection_items") - media_entry_table = inspect_table(metadata, "core__media_entries") + inspect_table(metadata, "core__media_entries") gmr_table = inspect_table(metadata, "core__generic_model_reference") ## @@ -1867,8 +1867,6 @@ def federation_graveyard(db): This adds a Graveyard model which is used to copy (soft-)deleted models to. """ - metadata = MetaData(bind=db.bind) - # Create the graveyard table Graveyard_V0.__table__.create(db.bind) diff --git a/mediagoblin/media_types/audio/__init__.py b/mediagoblin/media_types/audio/__init__.py index 6ad473c8..0ffff4a3 100644 --- a/mediagoblin/media_types/audio/__init__.py +++ b/mediagoblin/media_types/audio/__init__.py @@ -27,7 +27,7 @@ MEDIA_TYPE = 'mediagoblin.media_types.audio' def setup_plugin(): - config = pluginapi.get_config(MEDIA_TYPE) + pass class AudioMediaManager(MediaManagerBase): diff --git a/mediagoblin/media_types/audio/spectrogram.py b/mediagoblin/media_types/audio/spectrogram.py index 433bb300..bd136989 100644 --- a/mediagoblin/media_types/audio/spectrogram.py +++ b/mediagoblin/media_types/audio/spectrogram.py @@ -269,7 +269,6 @@ def create_spectrogram_image(source_filename, output_filename, progress_callback((x * 100) / image_size[0]) seek_point = int(x * samples_per_pixel) - next_seek_point = int((x + 1) * samples_per_pixel) (spectral_centroid, db_spectrum) = processor.spectral_centroid(seek_point) diff --git a/mediagoblin/media_types/blog/__init__.py b/mediagoblin/media_types/blog/__init__.py index 859c2162..b2b67c28 100644 --- a/mediagoblin/media_types/blog/__init__.py +++ b/mediagoblin/media_types/blog/__init__.py @@ -28,7 +28,6 @@ MEDIA_TYPE = 'mediagoblin.media_types.blogpost' def setup_plugin(): - config = pluginapi.get_config(MEDIA_TYPE) _log.info("setting up blog media type plugin.") routes = [ diff --git a/mediagoblin/media_types/blog/views.py b/mediagoblin/media_types/blog/views.py index f1d5c49d..01428465 100644 --- a/mediagoblin/media_types/blog/views.py +++ b/mediagoblin/media_types/blog/views.py @@ -56,7 +56,6 @@ def blog_edit(request): View for editing an existing blog or creating a new blog if user have not exceeded maximum allowed acount of blogs. """ - url_user = request.matchdict.get('user', None) blog_slug = request.matchdict.get('blog_slug', None) config = pluginapi.get_config('mediagoblin.media_types.blog') @@ -295,7 +294,6 @@ def blog_post_listing(request, page, url_user=None): def draft_view(request): blog_slug = request.matchdict.get('blog_slug', None) blog_post_slug = request.matchdict.get('blog_post_slug', None) - user = request.matchdict.get('user') blog = get_blog_by_slug(request, blog_slug, author=request.user.id) blogpost = request.db.MediaEntry.query.filter_by(state = u'failed', actor=request.user.id, slug=blog_post_slug).first() diff --git a/mediagoblin/moderation/views.py b/mediagoblin/moderation/views.py index ca0e6533..61e856b8 100644 --- a/mediagoblin/moderation/views.py +++ b/mediagoblin/moderation/views.py @@ -84,8 +84,6 @@ def moderation_users_detail(request): ).first() active_reports = user.reports_filed_on.filter( Report.resolved==None).limit(5) - closed_reports = user.reports_filed_on.filter( - Report.resolved!=None).all() privileges = Privilege.query user_banned = UserBan.query.get(user.id) ban_form = moderation_forms.BanForm() @@ -187,8 +185,6 @@ def give_or_take_away_privilege(request, url_user): ''' form = moderation_forms.PrivilegeAddRemoveForm(request.form) if request.method == "POST" and form.validate(): - privilege = Privilege.query.filter( - Privilege.privilege_name==form.privilege_name.data).one() if not take_away_privileges( url_user.username, form.privilege_name.data): diff --git a/mediagoblin/plugins/archivalook/views.py b/mediagoblin/plugins/archivalook/views.py index 72424cfc..9354a775 100644 --- a/mediagoblin/plugins/archivalook/views.py +++ b/mediagoblin/plugins/archivalook/views.py @@ -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/basic_auth/__init__.py b/mediagoblin/plugins/basic_auth/__init__.py index 31a4fd95..4ac23d14 100644 --- a/mediagoblin/plugins/basic_auth/__init__.py +++ b/mediagoblin/plugins/basic_auth/__init__.py @@ -29,8 +29,6 @@ PLUGIN_DIR = os.path.dirname(__file__) def setup_plugin(): - config = pluginapi.get_config('mediagoblin.plugins.basic_auth') - routes = [ ('mediagoblin.plugins.basic_auth.edit.pass', '/edit/password/', diff --git a/mediagoblin/plugins/geolocation/__init__.py b/mediagoblin/plugins/geolocation/__init__.py index 06aab68e..09ee37ed 100644 --- a/mediagoblin/plugins/geolocation/__init__.py +++ b/mediagoblin/plugins/geolocation/__init__.py @@ -20,8 +20,6 @@ import os PLUGIN_DIR = os.path.dirname(__file__) def setup_plugin(): - config = pluginapi.get_config('mediagoblin.plugins.geolocation') - # Register the template path. pluginapi.register_template_path(os.path.join(PLUGIN_DIR, 'templates')) diff --git a/mediagoblin/plugins/ldap/__init__.py b/mediagoblin/plugins/ldap/__init__.py index 4673acee..e231229c 100644 --- a/mediagoblin/plugins/ldap/__init__.py +++ b/mediagoblin/plugins/ldap/__init__.py @@ -22,8 +22,6 @@ PLUGIN_DIR = os.path.dirname(__file__) def setup_plugin(): - config = pluginapi.get_config('mediagoblin.plugins.ldap') - routes = [ ('mediagoblin.plugins.ldap.register', '/auth/ldap/register/', diff --git a/mediagoblin/plugins/openid/__init__.py b/mediagoblin/plugins/openid/__init__.py index b26087a2..5228fe34 100644 --- a/mediagoblin/plugins/openid/__init__.py +++ b/mediagoblin/plugins/openid/__init__.py @@ -28,8 +28,6 @@ PLUGIN_DIR = os.path.dirname(__file__) def setup_plugin(): - config = pluginapi.get_config('mediagoblin.plugins.openid') - routes = [ ('mediagoblin.plugins.openid.register', '/auth/openid/register/', diff --git a/mediagoblin/plugins/persona/__init__.py b/mediagoblin/plugins/persona/__init__.py index 8fab726a..b666cbef 100644 --- a/mediagoblin/plugins/persona/__init__.py +++ b/mediagoblin/plugins/persona/__init__.py @@ -29,8 +29,6 @@ PLUGIN_DIR = os.path.dirname(__file__) def setup_plugin(): - config = pluginapi.get_config('mediagoblin.plugins.persona') - routes = [ ('mediagoblin.plugins.persona.login', '/auth/persona/login/', diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py index bedfd32d..37c2e226 100644 --- a/mediagoblin/processing/task.py +++ b/mediagoblin/processing/task.py @@ -49,7 +49,7 @@ def handle_push_urls(feed_url): for huburl in mgg.app_config["push_urls"]: hubrequest = request.Request(huburl, hubdata, hubheaders) try: - hubresponse = request.urlopen(hubrequest) + request.urlopen(hubrequest) except (request.HTTPError, request.URLError) as exc: # We retry by default 3 times before failing _log.info("PuSH url %r gave error %r", huburl, exc) diff --git a/mediagoblin/tests/test_api.py b/mediagoblin/tests/test_api.py index 90873cb9..011f69b5 100644 --- a/mediagoblin/tests/test_api.py +++ b/mediagoblin/tests/test_api.py @@ -286,7 +286,6 @@ class TestAPI(object): request = test_app.get(object_uri) image = json.loads(request.body.decode()) - entry = MediaEntry.query.filter_by(public_id=image["id"]).first() assert request.status_code == 200 @@ -432,7 +431,7 @@ class TestAPI(object): def test_whoami_without_login(self, test_app): """ Test that whoami endpoint returns error when not logged in """ with pytest.raises(AppError) as excinfo: - response = test_app.get("/api/whoami") + test_app.get("/api/whoami") assert "401 UNAUTHORIZED" in excinfo.value.args[0] @@ -622,7 +621,6 @@ class TestAPI(object): # Verify the comment no longer exists assert TextComment.query.filter_by(public_id=comment["object"]["id"]).first() is None - comment_id = comment["object"]["id"] # Check we've got a delete activity back assert "id" in delete diff --git a/mediagoblin/tests/test_collections.py b/mediagoblin/tests/test_collections.py index 87782f30..68dd8c9e 100644 --- a/mediagoblin/tests/test_collections.py +++ b/mediagoblin/tests/test_collections.py @@ -21,7 +21,7 @@ from mediagoblin.db.models import Collection, User def test_user_deletes_collection(test_app): # Setup db. user = fixture_add_user() - coll = fixture_add_collection(user=user) + fixture_add_collection(user=user) # Reload into session: user = User.query.get(user.id) diff --git a/mediagoblin/tests/test_edit.py b/mediagoblin/tests/test_edit.py index 632c8e3c..8dbe51be 100644 --- a/mediagoblin/tests/test_edit.py +++ b/mediagoblin/tests/test_edit.py @@ -46,7 +46,7 @@ class TestUserEdit(object): # Make sure user exists assert LocalUser.query.filter(LocalUser.username==u'chris').first() - res = test_app.post('/edit/account/delete/', {'confirmed': 'y'}) + test_app.post('/edit/account/delete/', {'confirmed': 'y'}) # Make sure user has been deleted assert LocalUser.query.filter(LocalUser.username==u'chris').first() == None diff --git a/mediagoblin/tests/test_notifications.py b/mediagoblin/tests/test_notifications.py index 776bfc71..bbffc074 100644 --- a/mediagoblin/tests/test_notifications.py +++ b/mediagoblin/tests/test_notifications.py @@ -83,8 +83,6 @@ class TestNotifications: media_entry = fixture_media_entry(uploader=user.id, state=u'processed') - media_entry_id = media_entry.id - subscription = fixture_comment_subscription(media_entry) subscription_id = subscription.id diff --git a/mediagoblin/tests/test_openid.py b/mediagoblin/tests/test_openid.py index 71767032..f318473c 100644 --- a/mediagoblin/tests/test_openid.py +++ b/mediagoblin/tests/test_openid.py @@ -264,7 +264,7 @@ class TestOpenIDPlugin(object): # Try and delete only OpenID url template.clear_test_template_context() - res = openid_plugin_app.post( + openid_plugin_app.post( '/edit/openid/delete/', { 'openid': 'http://real.myopenid.com'}) assert 'mediagoblin/plugins/openid/delete.html' in template.TEMPLATE_TEST_CONTEXT @@ -272,8 +272,7 @@ class TestOpenIDPlugin(object): # Add OpenID to user # Empty form template.clear_test_template_context() - res = openid_plugin_app.post( - '/edit/openid/', {}) + openid_plugin_app.post('/edit/openid/', {}) context = template.TEMPLATE_TEST_CONTEXT['mediagoblin/plugins/openid/add.html'] form = context['form'] assert form.openid.errors == [u'This field is required.'] diff --git a/mediagoblin/tests/test_privileges.py b/mediagoblin/tests/test_privileges.py index 2e0b7347..3ad6cd0c 100644 --- a/mediagoblin/tests/test_privileges.py +++ b/mediagoblin/tests/test_privileges.py @@ -146,7 +146,6 @@ class TestPrivilegeFunctionality: media_entry = fixture_media_entry(uploader=self.admin_user.id, state=u'processed') - media_entry_id = media_entry.id media_uri_id = '/u/{0}/m/{1}/'.format(self.admin_user.username, media_entry.id) media_uri_slug = '/u/{0}/m/{1}/'.format(self.admin_user.username, diff --git a/mediagoblin/tests/test_reporting.py b/mediagoblin/tests/test_reporting.py index 803fc849..f5473db5 100644 --- a/mediagoblin/tests/test_reporting.py +++ b/mediagoblin/tests/test_reporting.py @@ -66,7 +66,6 @@ class TestReportFiling: media_entry = fixture_media_entry(uploader=natalie_user.id, state=u'processed') - mid = media_entry.id media_uri_slug = '/u/{0}/m/{1}/'.format(natalie_user.username, media_entry.slug) @@ -95,7 +94,6 @@ class TestReportFiling: media_entry = fixture_media_entry(uploader=natalie_user.id, state=u'processed') - mid = media_entry.id fixture_add_comment( media_entry=media_entry, author=natalie_user.id diff --git a/mediagoblin/tests/test_sql_migrations.py b/mediagoblin/tests/test_sql_migrations.py index 97d7da09..ad2e4a26 100644 --- a/mediagoblin/tests/test_sql_migrations.py +++ b/mediagoblin/tests/test_sql_migrations.py @@ -141,18 +141,15 @@ def creature_powers_new_table(db_conn): # We have to access the creature table so sqlalchemy can make the # foreign key relationship - creature_table = Table( - 'creature', metadata, - autoload=True, autoload_with=db_conn.bind) - - creature_powers = Table( - 'creature_power', metadata, - Column('id', Integer, primary_key=True), - Column('creature', - Integer, ForeignKey('creature.id'), nullable=False), - Column('name', Unicode), - Column('description', Unicode), - Column('hitpower', Integer, nullable=False)) + Table('creature', metadata, autoload=True, autoload_with=db_conn.bind) + + Table('creature_power', metadata, + Column('id', Integer, primary_key=True), + Column('creature', + Integer, ForeignKey('creature.id'), nullable=False), + Column('name', Unicode), + Column('description', Unicode), + Column('hitpower', Integer, nullable=False)) metadata.create_all(db_conn.bind) @@ -314,9 +311,7 @@ def creature_power_hitpower_to_float(db_conn): # We have to access the creature table so sqlalchemy can make the # foreign key relationship - creature_table = Table( - 'creature', metadata, - autoload=True, autoload_with=db_conn.bind) + Table('creature', metadata, autoload=True, autoload_with=db_conn.bind) creature_power = Table( 'creature_power', metadata, diff --git a/mediagoblin/tests/test_storage.py b/mediagoblin/tests/test_storage.py index a4c3e4eb..ec1f6046 100644 --- a/mediagoblin/tests/test_storage.py +++ b/mediagoblin/tests/test_storage.py @@ -190,8 +190,7 @@ def test_basic_storage_get_file(): assert our_file.read() == 'Second file' # Read from an existing file - manually_written_file = os.makedirs( - os.path.join(tmpdir, 'testydir')) + os.makedirs(os.path.join(tmpdir, 'testydir')) with open(os.path.join(tmpdir, 'testydir/testyfile.txt'), 'w') as testyfile: testyfile.write('testy file! so testy.') diff --git a/mediagoblin/tests/test_video.py b/mediagoblin/tests/test_video.py index 79244515..0bffe9a8 100644 --- a/mediagoblin/tests/test_video.py +++ b/mediagoblin/tests/test_video.py @@ -67,9 +67,9 @@ def create_data(suffix=None, make_audio=False): state = pipeline.get_state(3 * Gst.SECOND) assert state[0] == Gst.StateChangeReturn.SUCCESS bus = pipeline.get_bus() - message = bus.timed_pop_filtered( - 3 * Gst.SECOND, - Gst.MessageType.ERROR | Gst.MessageType.EOS) + bus.timed_pop_filtered( + 3 * Gst.SECOND, + Gst.MessageType.ERROR | Gst.MessageType.EOS) pipeline.set_state(Gst.State.NULL) if suffix: result = tempfile.NamedTemporaryFile(suffix=suffix) diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index b4737ea8..9b30dd22 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -441,7 +441,6 @@ def collection_item_confirm_remove(request, collection_item): form = user_forms.ConfirmCollectionItemRemoveForm(request.form) if request.method == 'POST' and form.validate(): - username = collection_item.in_collection.get_actor.username collection = collection_item.in_collection if form.confirm.data is True: -- 2.14.2