cleanup unused imports

mygpo/administration/tasks.py

@@ -4,7 +4,6 @@
 from django_db_geventpool.utils import close_connection
 
 from mygpo.podcasts.models import Podcast
-from mygpo.celery import celery
 from mygpo.maintenance.merge import PodcastMerger
 
 from celery.utils.log import get_task_logger

mygpo/administration/tests.py

@@ -67,8 +67,8 @@ def test_merge(self):
         subscribe(p1.pk, user.pk, device1.uid)
         subscribe(p2.pk, user.pk, device2.uid)
 
-        action1 = EpisodeHistoryEntry.create_entry(user, e1, EpisodeHistoryEntry.PLAY)
-        action3 = EpisodeHistoryEntry.create_entry(user, e3, EpisodeHistoryEntry.PLAY)
+        EpisodeHistoryEntry.create_entry(user, e1, EpisodeHistoryEntry.PLAY)
+        EpisodeHistoryEntry.create_entry(user, e3, EpisodeHistoryEntry.PLAY)
 
         # we need that for later
         e3_id = e3.pk

mygpo/administration/views.py

@@ -1,7 +1,6 @@
 import re
 import socket
-from itertools import count, chain
-from collections import Counter
+from itertools import count
 from datetime import datetime
 
 import redis
@@ -14,7 +13,6 @@
 from django.core.cache import cache
 from django.http import HttpResponseRedirect
 from django.template.loader import render_to_string
-from django.template import RequestContext
 from django.utils.translation import gettext as _
 from django.contrib.sites.requests import RequestSite
 from django.views.generic import TemplateView
@@ -25,7 +23,7 @@
 from mygpo.podcasts.models import Podcast, Episode
 from mygpo.administration.auth import require_staff
 from mygpo.administration.group import PodcastGrouper
-from mygpo.maintenance.merge import PodcastMerger, IncorrectMergeException
+from mygpo.maintenance.merge import IncorrectMergeException
 from mygpo.administration.clients import UserAgentStats, ClientStats
 from mygpo.users.views.registration import send_activation_email
 from mygpo.administration.tasks import merge_podcasts

mygpo/api/advanced/__init__.py

@@ -1,6 +1,3 @@
-from functools import partial
-
-from collections import defaultdict
 from datetime import datetime
 from importlib import import_module
 
@@ -9,7 +6,6 @@
 from django.http import (
     HttpResponse,
     HttpResponseBadRequest,
-    Http404,
     HttpResponseNotFound,
 )
 from django.core.exceptions import ValidationError
@@ -307,7 +303,7 @@ def device(request, username, device_uid, version=None):
 
     try:
         data = parse_request_body(request)
-    except (UnicodeDecodeError, ValueError) as e:
+    except (UnicodeDecodeError, ValueError):
         msg = ("Could not decode device update POST data for " + "user %s: %s") % (
             username,
             request.body.decode("ascii", errors="replace"),

mygpo/api/advanced/episode.py

@@ -3,7 +3,7 @@
 from mygpo.api import APIView, RequestException
 from mygpo.api.httpresponse import JsonResponse
 from mygpo.api.exceptions import ParameterMissing
-from mygpo.chapters.models import Chapter
+from mygpo.chapters.models import Chapter, Episode, Podcast
 from mygpo.utils import parse_time, normalize_feed_url, get_timestamp
 
 

mygpo/api/advanced/lists.py

@@ -2,18 +2,16 @@
 from functools import partial
 from datetime import datetime
 
-from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden
+from django.http import HttpResponse, HttpResponseBadRequest
 from django.views.decorators.csrf import csrf_exempt
 from django.urls import reverse
 from django.contrib.sites.requests import RequestSite
 from django.contrib.auth import get_user_model
 from django.utils.text import slugify
 from django.views.decorators.cache import never_cache
 from django.http import Http404
-from django.shortcuts import get_object_or_404
 
 from mygpo.podcasts.models import Podcast
-from mygpo.utils import get_timestamp
 from mygpo.api.advanced.directory import podcast_data
 from mygpo.api.httpresponse import JsonResponse
 from mygpo.podcastlists.models import PodcastList

mygpo/api/advanced/settings.py

@@ -1,5 +1,3 @@
-import json
-
 from django.shortcuts import get_object_or_404
 
 from mygpo.api import APIView, RequestException

mygpo/api/advanced/updates.py

@@ -1,4 +1,3 @@
-from itertools import chain
 from datetime import datetime
 
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
@@ -16,7 +15,6 @@
 from mygpo.subscriptions import get_subscription_history, subscription_diff
 from mygpo.users.models import Client
 from mygpo.episodestates.models import EpisodeState
-from mygpo.users.subscriptions import subscription_changes, podcasts_for_states
 from mygpo.api.basic_auth import require_valid_user, check_username
 from mygpo.decorators import cors_origin
 
@@ -42,7 +40,6 @@ class DeviceUpdates(View):
     def get(self, request, username, device_uid):
 
         now = datetime.utcnow()
-        now_ = get_timestamp(now)
 
         user = request.user
 

mygpo/api/subscriptions.py

@@ -10,7 +10,6 @@
 from mygpo.users.models import Client
 from mygpo.subscriptions.tasks import subscribe, unsubscribe
 from mygpo.subscriptions import get_subscription_history, subscription_diff
-from mygpo.api.basic_auth import require_valid_user, check_username
 
 import logging
 

mygpo/api/tasks.py

@@ -3,7 +3,6 @@
 
 from django_db_geventpool.utils import close_connection
 
-from mygpo.celery import celery
 from mygpo.api.advanced import update_episodes
 
 logger = get_task_logger(__name__)

mygpo/api/tests.py

@@ -13,7 +13,6 @@
 from django.test.utils import override_settings
 
 from openapi_spec_validator import validate_spec_url
-from jsonschema import ValidationError
 
 from mygpo.podcasts.models import Podcast, Episode
 from mygpo.api.advanced import episodes

mygpo/celery.py

@@ -1,7 +1,5 @@
 import os
 
-from django.conf import settings
-
 from celery import Celery
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "mygpo.settings")

mygpo/chapters/models.py

@@ -2,7 +2,7 @@
 from django.conf import settings
 
 from mygpo.core.models import UpdateInfoModel
-from mygpo.podcasts.models import Episode
+from mygpo.podcasts.models import Episode, Podcast
 
 
 class Chapter(UpdateInfoModel):

mygpo/data/feeddownloader.py

@@ -2,10 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import os.path
-import urllib.request
-import urllib.error
 from urllib.parse import urljoin
-import hashlib
 from datetime import datetime, timedelta
 from itertools import chain, islice
 import requests
@@ -65,7 +62,7 @@ def update_podcasts(queue):
         except NoPodcastCreated as npc:
             logger.info("No podcast created: %s", npc)
 
-        except NoEpisodesException as nee:
+        except NoEpisodesException:
             logger.info(f"No episodes found when parsing {podcast_url}")
             continue
 
@@ -339,9 +336,6 @@ def __init__(self, podcast, update_result):
         self.max_episode_order = None
 
     def update_episodes(self, parsed_episodes):
-
-        pid = self.podcast.get_id()
-
         episodes_to_update = list(islice(parsed_episodes, 0, MAX_EPISODES_UPDATE))
         logger.info(
             "Parsed %d (%d) episodes", len(parsed_episodes), len(episodes_to_update)

mygpo/data/flickr.py

@@ -35,7 +35,7 @@ def get_photo_sizes(photo_id):
 
     try:
         resp_obj = resp.json()
-    except json.JSONDecodeError as jde:
+    except json.JSONDecodeError:
         return []
 
     try:

mygpo/data/management/commands/feed-downloader.py

@@ -1,6 +1,4 @@
 from itertools import islice
-import traceback
-from optparse import make_option
 
 from mygpo.maintenance.management.podcastcmd import PodcastCommand
 from mygpo.data.feeddownloader import update_podcasts

mygpo/data/management/commands/tag-downloader.py

@@ -1,6 +1,5 @@
 import time
 import urllib.request, urllib.error, urllib.parse
-from optparse import make_option
 
 from mygpo.data import delicious
 from mygpo.maintenance.management.podcastcmd import PodcastCommand

mygpo/data/podcast.py

@@ -40,13 +40,12 @@ def calc_similar_podcasts(podcast, num=20, user_sample=100):
 
     # get other podcasts that the user sample subscribes to
     podcasts = Counter()
-    for user_id in user_ids:
-        subscriptions = (
-            Podcast.objects.filter(subscription__user__id__in=user_ids)
-            .distinct("pk")
-            .exclude(pk=podcast.pk)
-        )
-        podcasts.update(Counter(subscriptions))
+    subscriptions = (
+        Podcast.objects.filter(subscription__user__id__in=user_ids)
+        .distinct("pk")
+        .exclude(pk=podcast.pk)
+    )
+    podcasts.update(Counter(subscriptions))
     logger.info(
         "Found {num_podcasts}, returning top {num_results}".format(
             num_podcasts=len(podcasts), num_results=num

mygpo/directory/management/commands/category-merge-spellings.py

@@ -1,5 +1,3 @@
-from datetime import datetime
-
 from django.core.management.base import BaseCommand
 from django.utils.text import slugify
 
@@ -20,7 +18,6 @@ def handle(self, *args, **options):
             )
             return
 
-        start_time = datetime.utcnow()
         cat_name = args[0]
         spellings = args[1:]
 

mygpo/directory/management/commands/update-toplist.py

@@ -1,5 +1,3 @@
-from optparse import make_option
-
 from django.core.management.base import BaseCommand
 
 from mygpo.podcasts.models import Podcast

mygpo/directory/search.py

@@ -19,7 +19,7 @@ def search_podcasts(q):
         if not podcast or not podcast.title:
             try:
                 updater.update_podcast()
-            except NoPodcastCreated as npc:
+            except NoPodcastCreated:
                 return []
 
         try:

mygpo/directory/tasks.py

@@ -3,7 +3,6 @@
 
 from mygpo.podcasts.models import Podcast
 from mygpo.subscriptions.models import Subscription
-from mygpo.celery import celery
 
 
 @shared_task(max_retries=5)

mygpo/directory/tests.py

@@ -1,9 +1,7 @@
 import unittest
-import doctest
 import uuid
 from datetime import datetime
 
-from django.test import TestCase
 
 from mygpo.podcasts.models import Podcast
 from mygpo.directory.views import ToplistView

mygpo/directory/views.py

@@ -16,15 +16,13 @@
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages
 from django.utils.translation import gettext as _
-from django.contrib.auth import get_user_model
 
 from mygpo.podcasts.models import Podcast, Episode
 from mygpo.directory.search import search_podcasts
 from mygpo.web.utils import (
     process_lang_params,
     get_language_names,
     get_page_list,
-    get_podcast_link_target,
     sanitize_language_codes,
 )
 from mygpo.directory.tags import Topics
@@ -335,7 +333,7 @@ def get(self, request, task_id):
 
         except (UpdatePodcastException, NoEpisodesException) as ex:
             messages.error(request, str(ex))
-            podcast = None
+            podcasts = []
 
         return self.render_to_response({"ready": True, "podcasts": podcasts})
 

mygpo/episodestates/tasks.py

@@ -2,7 +2,6 @@
 from django_db_geventpool.utils import close_connection
 from celery import shared_task
 
-from mygpo.celery import celery
 from mygpo.history.models import EpisodeHistoryEntry
 from mygpo.episodestates.models import EpisodeState
 
@@ -31,7 +30,7 @@ def update_episode_state(historyentry_pk):
         )
     )
 
-    state = EpisodeState.objects.update_or_create(
+    EpisodeState.objects.update_or_create(
         user=user,
         episode=episode,
         defaults={"action": historyentry.action, "timestamp": historyentry.timestamp},

mygpo/favorites/migrations/0002_unique.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-from django.db import models, migrations
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

mygpo/history/migrations/0002_pluralname.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-from django.db import models, migrations
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

mygpo/history/migrations/0006_episodehistory_index.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-from django.db import models, migrations
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

mygpo/history/migrations/0007_episodehistory_index.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-from django.db import models, migrations
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

mygpo/history/migrations/0008_episodehistory_index.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 
-from django.db import models, migrations
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

mygpo/history/migrations/0010_episode_history_index.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django.db import models, migrations
+from django.db import migrations
 
 
 class Migration(migrations.Migration):

mygpo/history/models.py

@@ -1,4 +1,3 @@
-from collections import Counter
 from datetime import datetime
 
 from django.db import models