From 7c27519526fc6208007802dbc705be339a89cb63 Mon Sep 17 00:00:00 2001 From: Stefan Koegl Date: Sat, 18 Sep 2010 18:41:03 +0300 Subject: [PATCH] remove unnecessary imports --- mygpo/api/admin.py | 2 -- mygpo/api/advanced/__init__.py | 6 ++--- mygpo/api/advanced/auth.py | 6 +---- mygpo/api/advanced/directory.py | 26 ++-------------------- mygpo/api/advanced/episode.py | 6 ++--- mygpo/api/advanced/settings.py | 2 +- mygpo/api/backend.py | 4 +--- mygpo/api/models/__init__.py | 5 ++--- mygpo/api/opml.py | 1 - mygpo/api/put_test.py | 1 - mygpo/api/sanitizing.py | 3 +-- mygpo/api/tests.py | 3 +-- mygpo/auth_backends.py | 3 --- mygpo/data/directory.py | 1 - mygpo/data/feeddownloader.py | 2 -- mygpo/data/historic.py | 2 +- mygpo/data/management/commands/historic-data.py | 2 +- mygpo/data/management/commands/merge-duplicates.py | 3 --- mygpo/data/management/commands/update-directory.py | 1 - .../data/management/commands/update-suggestions.py | 3 +-- mygpo/data/management/commands/update-toplist.py | 3 +-- mygpo/data/mimetype.py | 2 +- mygpo/data/models.py | 2 +- mygpo/data/podcast.py | 2 +- mygpo/data/signals.py | 1 - mygpo/publisher/auth.py | 3 +-- .../management/commands/make-publisher.py | 1 - mygpo/publisher/templatetags/pcharts.py | 2 -- mygpo/publisher/views.py | 3 +-- .../management/commands/build-search-index.py | 1 - mygpo/search/signals.py | 3 --- mygpo/search/util.py | 2 -- mygpo/security.py | 1 - mygpo/userfeeds/views.py | 1 - mygpo/utils.py | 2 +- mygpo/web/admin.py | 2 +- mygpo/web/forms.py | 1 - mygpo/web/templatetags/charts.py | 3 --- mygpo/web/templatetags/flickr.py | 1 - mygpo/web/templatetags/math.py | 3 --- mygpo/web/templatetags/mygpoutil.py | 1 - mygpo/web/templatetags/time.py | 1 - mygpo/web/templatetags/utils.py | 1 - mygpo/web/urls.py | 1 - mygpo/web/views/device.py | 13 ++--------- mygpo/web/views/episode.py | 6 ++--- mygpo/web/views/public.py | 8 ++----- mygpo/web/views/settings.py | 3 --- mygpo/web/views/users.py | 6 ++--- 49 files changed, 32 insertions(+), 129 deletions(-) diff --git a/mygpo/api/admin.py b/mygpo/api/admin.py index a6ce69ba..9c082abd 100644 --- a/mygpo/api/admin.py +++ b/mygpo/api/admin.py @@ -16,9 +16,7 @@ # from django.contrib import admin -from django import forms from django.contrib.auth.models import User -from django.contrib.auth.admin import UserAdmin from mygpo.api.models import * class DeviceInline(admin.TabularInline): diff --git a/mygpo/api/advanced/__init__.py b/mygpo/api/advanced/__init__.py index ef3b45ea..32db6615 100644 --- a/mygpo/api/advanced/__init__.py +++ b/mygpo/api/advanced/__init__.py @@ -16,23 +16,21 @@ # from mygpo.api.basic_auth import require_valid_user, check_username -from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden +from django.http import HttpResponse, HttpResponseBadRequest from mygpo.api.models import Device, Podcast, SubscriptionAction, Episode, EpisodeAction, SUBSCRIBE_ACTION, UNSUBSCRIBE_ACTION, EPISODE_ACTION_TYPES, DEVICE_TYPES, Subscription from mygpo.api.models.users import EpisodeFavorite from mygpo.api.httpresponse import JsonResponse from mygpo.api.sanitizing import sanitize_url from mygpo.api.advanced.directory import episode_data, podcast_data from mygpo.api.backend import get_all_subscriptions -from django.core import serializers from django.shortcuts import get_object_or_404 from time import mktime, gmtime, strftime -from datetime import datetime, timedelta +from datetime import datetime import dateutil.parser from mygpo.log import log from mygpo.utils import parse_time, parse_bool from mygpo.decorators import allowed_methods from django.db import IntegrityError -import re from django.views.decorators.csrf import csrf_exempt try: diff --git a/mygpo/api/advanced/auth.py b/mygpo/api/advanced/auth.py index ba3ab162..cc4136f0 100644 --- a/mygpo/api/advanced/auth.py +++ b/mygpo/api/advanced/auth.py @@ -15,18 +15,14 @@ # along with my.gpodder.org. If not, see . # -from django.contrib.auth.models import User from mygpo.api.basic_auth import require_valid_user, check_username from django.contrib import auth -from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden +from django.http import HttpResponse from mygpo.api.httpresponse import JsonResponse -from mygpo.web.models import SecurityToken from django.shortcuts import get_object_or_404 from mygpo.api.models import Device from django.utils.translation import ugettext as _ from datetime import datetime, timedelta -from mygpo.log import log -import random from django.views.decorators.csrf import csrf_exempt diff --git a/mygpo/api/advanced/directory.py b/mygpo/api/advanced/directory.py index 47a5c859..4706ffb8 100644 --- a/mygpo/api/advanced/directory.py +++ b/mygpo/api/advanced/directory.py @@ -15,36 +15,13 @@ # along with my.gpodder.org. If not, see . # -from mygpo.api.basic_auth import require_valid_user, check_username -from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden from mygpo.api.httpresponse import JsonResponse -from mygpo.exceptions import ParameterMissing from django.shortcuts import get_object_or_404 from mygpo.api.sanitizing import sanitize_url -from mygpo.api.models import Device, Podcast, Episode, ToplistEntry -from mygpo.api.models.episodes import Chapter -from mygpo.data.models import PodcastTag -from django.utils.translation import ugettext as _ -from datetime import datetime, timedelta -from mygpo.log import log -from mygpo.utils import parse_time -import dateutil.parser +from mygpo.api.models import Podcast, Episode, ToplistEntry from django.contrib.sites.models import Site from django.views.decorators.csrf import csrf_exempt -try: - #try to import the JSON module (if we are on Python 2.6) - import json - - # Python 2.5 seems to have a different json module - if not 'dumps' in dir(json): - raise ImportError - -except ImportError: - # No JSON module available - fallback to simplejson (Python < 2.6) - print "No JSON module available - fallback to simplejson (Python < 2.6)" - import simplejson as json - @csrf_exempt def top_tags(request, count): @@ -118,3 +95,4 @@ def episode_data(episode): "website": episode.link, "mygpo_link": 'http://%s/episode/%s' % (site.domain, episode.id), } + diff --git a/mygpo/api/advanced/episode.py b/mygpo/api/advanced/episode.py index 32ab82bc..c8ecc070 100644 --- a/mygpo/api/advanced/episode.py +++ b/mygpo/api/advanced/episode.py @@ -16,16 +16,14 @@ # from mygpo.api.basic_auth import require_valid_user, check_username -from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden +from django.http import HttpResponseBadRequest from mygpo.api.httpresponse import JsonResponse from mygpo.exceptions import ParameterMissing -from django.shortcuts import get_object_or_404 from mygpo.api.sanitizing import sanitize_url from mygpo.api.models import Device, Podcast, Episode from mygpo.api.models.episodes import Chapter from django.utils.translation import ugettext as _ -from datetime import datetime, timedelta -from mygpo.log import log +from datetime import datetime from mygpo.utils import parse_time from mygpo.decorators import allowed_methods import dateutil.parser diff --git a/mygpo/api/advanced/settings.py b/mygpo/api/advanced/settings.py index d7af6793..c772fc7b 100644 --- a/mygpo/api/advanced/settings.py +++ b/mygpo/api/advanced/settings.py @@ -19,7 +19,7 @@ from mygpo.api.basic_auth import require_valid_user, check_username from django.http import HttpResponseBadRequest from mygpo.api.httpresponse import JsonResponse from django.shortcuts import get_object_or_404 -from mygpo.api.models import Device, UserProfile, SubscriptionMeta, EpisodeSettings +from mygpo.api.models import Device, SubscriptionMeta, EpisodeSettings from django.views.decorators.csrf import csrf_exempt from mygpo.decorators import allowed_methods import json diff --git a/mygpo/api/backend.py b/mygpo/api/backend.py index 73f23680..9763bf12 100644 --- a/mygpo/api/backend.py +++ b/mygpo/api/backend.py @@ -17,9 +17,7 @@ from mygpo.api.models import ToplistEntry, Podcast, Subscription, EpisodeToplistEntry from mygpo.data.mimetype import get_type, CONTENT_TYPES -from django.db.models import Max -from datetime import datetime, timedelta -import re +from datetime import timedelta try: import json diff --git a/mygpo/api/models/__init__.py b/mygpo/api/models/__init__.py index 3a9c2f89..3066a01d 100644 --- a/mygpo/api/models/__init__.py +++ b/mygpo/api/models/__init__.py @@ -16,15 +16,14 @@ # from django.db import models -from django.contrib.auth.models import User, UserManager +from django.contrib.auth.models import User from datetime import datetime from django.utils.translation import ugettext as _ from mygpo.api.fields import SeparatedValuesField, JSONField import hashlib import re -import json -from mygpo.api.constants import EPISODE_ACTION_TYPES, DEVICE_TYPES, SUBSCRIBE_ACTION, UNSUBSCRIBE_ACTION, SUBSCRIPTION_ACTION_TYPES +from mygpo.api.constants import EPISODE_ACTION_TYPES, DEVICE_TYPES, SUBSCRIBE_ACTION, SUBSCRIPTION_ACTION_TYPES from mygpo.log import log class UserProfile(models.Model): diff --git a/mygpo/api/opml.py b/mygpo/api/opml.py index 17c31385..b3a8747c 100644 --- a/mygpo/api/opml.py +++ b/mygpo/api/opml.py @@ -23,7 +23,6 @@ the web and to export a list of podcast objects to valid OPML 1.1 files. """ import os -import os.path import xml.dom.minidom import email.Utils diff --git a/mygpo/api/put_test.py b/mygpo/api/put_test.py index ef87783e..24df3cf3 100644 --- a/mygpo/api/put_test.py +++ b/mygpo/api/put_test.py @@ -1,4 +1,3 @@ -import sys import httplib import base64 import time diff --git a/mygpo/api/sanitizing.py b/mygpo/api/sanitizing.py index dd39cbfb..4cfdac78 100644 --- a/mygpo/api/sanitizing.py +++ b/mygpo/api/sanitizing.py @@ -1,11 +1,10 @@ -from mygpo.api.models import URLSanitizingRule, Podcast, ToplistEntry, SuggestionEntry, SubscriptionAction, SubscriptionMeta, Subscription, Episode, EpisodeAction, EpisodeToplistEntry +from mygpo.api.models import URLSanitizingRule, Podcast, ToplistEntry, SuggestionEntry, SubscriptionAction, SubscriptionMeta, Subscription, Episode, EpisodeAction from mygpo.api.models.episodes import Chapter from mygpo.api.models.users import EpisodeFavorite from mygpo.data.models import BackendSubscription, Listener, HistoricPodcastData, PodcastTag from mygpo.log import log import urlparse import re -import sys def sanitize_url(url, podcast=True, episode=False, rules=URLSanitizingRule.objects.all().order_by('priority')): url = basic_sanitizing(url) diff --git a/mygpo/api/tests.py b/mygpo/api/tests.py index 9fd1d424..6d05b1d6 100644 --- a/mygpo/api/tests.py +++ b/mygpo/api/tests.py @@ -18,10 +18,9 @@ from django.test import TestCase from django.test.client import Client from django.contrib.auth.models import User -from mygpo.api.models import Device, Podcast, Subscription, SubscriptionAction, UserProfile, EpisodeAction +from mygpo.api.models import Device, Podcast, SubscriptionAction, UserProfile from django.http import HttpRequest from mygpo.api.simple import subscriptions -from mygpo.api.advanced import devices import time try: diff --git a/mygpo/auth_backends.py b/mygpo/auth_backends.py index 7b720edf..f43805a0 100644 --- a/mygpo/auth_backends.py +++ b/mygpo/auth_backends.py @@ -15,11 +15,8 @@ # along with my.gpodder.org. If not, see . # -from django.conf import settings from django.contrib.auth.models import User from django.contrib.auth.backends import ModelBackend -from django.core.exceptions import ImproperlyConfigured -from django.db.models import get_model try: from django.forms.fields import email_re diff --git a/mygpo/data/directory.py b/mygpo/data/directory.py index 65ea8f4c..f05aa35f 100755 --- a/mygpo/data/directory.py +++ b/mygpo/data/directory.py @@ -15,7 +15,6 @@ # along with my.gpodder.org. If not, see . # -from mygpo.api.models import Podcast, Episode, Subscription from mygpo.data.models import PodcastTag from django.db.models import Sum, Count, Avg from collections import defaultdict diff --git a/mygpo/data/feeddownloader.py b/mygpo/data/feeddownloader.py index 25affa3b..3ed5cba6 100755 --- a/mygpo/data/feeddownloader.py +++ b/mygpo/data/feeddownloader.py @@ -26,8 +26,6 @@ import datetime import hashlib import urllib2 import socket -import time -import mimetypes from mygpo import feedcore from mygpo.api import models diff --git a/mygpo/data/historic.py b/mygpo/data/historic.py index 24569d6f..6e99718d 100644 --- a/mygpo/data/historic.py +++ b/mygpo/data/historic.py @@ -1,4 +1,4 @@ -from mygpo.api.models import Podcast, Episode, SubscriptionAction, EpisodeAction +from mygpo.api.models import Podcast, SubscriptionAction from mygpo.data.models import HistoricPodcastData from mygpo.utils import daterange from datetime import date, timedelta diff --git a/mygpo/data/management/commands/historic-data.py b/mygpo/data/management/commands/historic-data.py index fcd35116..c5d30038 100644 --- a/mygpo/data/management/commands/historic-data.py +++ b/mygpo/data/management/commands/historic-data.py @@ -1,6 +1,6 @@ from django.core.management.base import BaseCommand from mygpo.data.historic import calc_podcast -from mygpo.api.models import Podcast, Episode +from mygpo.api.models import Podcast class Command(BaseCommand): def handle(self, *args, **options): diff --git a/mygpo/data/management/commands/merge-duplicates.py b/mygpo/data/management/commands/merge-duplicates.py index 73694880..7af6d7db 100644 --- a/mygpo/data/management/commands/merge-duplicates.py +++ b/mygpo/data/management/commands/merge-duplicates.py @@ -1,9 +1,6 @@ from django.core.management.base import BaseCommand from mygpo.api.models import Podcast, Episode from mygpo.api.sanitizing import rewrite_podcasts, rewrite_episodes -from mygpo.data import feeddownloader -from optparse import make_option -import datetime class Command(BaseCommand): diff --git a/mygpo/data/management/commands/update-directory.py b/mygpo/data/management/commands/update-directory.py index 4cd52f49..7935daf5 100755 --- a/mygpo/data/management/commands/update-directory.py +++ b/mygpo/data/management/commands/update-directory.py @@ -1,5 +1,4 @@ from django.core.management.base import BaseCommand -from optparse import make_option from mygpo.api.models import Podcast, PodcastGroup from mygpo.data.models import DirectoryEntry from mygpo.data.directory import get_source_weights, get_weighted_tags, get_weighted_group_tags diff --git a/mygpo/data/management/commands/update-suggestions.py b/mygpo/data/management/commands/update-suggestions.py index 3c3852fc..8a13b413 100644 --- a/mygpo/data/management/commands/update-suggestions.py +++ b/mygpo/data/management/commands/update-suggestions.py @@ -1,9 +1,8 @@ from django.core.management.base import BaseCommand from django.contrib.auth.models import User from optparse import make_option -from mygpo.api.models import Podcast, SuggestionEntry, Subscription, UserProfile +from mygpo.api.models import SuggestionEntry, Subscription, UserProfile from mygpo.data.models import RelatedPodcast, SuggestionBlacklist -from mygpo.data.podcast import calc_similar_podcasts class Command(BaseCommand): diff --git a/mygpo/data/management/commands/update-toplist.py b/mygpo/data/management/commands/update-toplist.py index 69c145af..8f848158 100644 --- a/mygpo/data/management/commands/update-toplist.py +++ b/mygpo/data/management/commands/update-toplist.py @@ -1,7 +1,6 @@ from django.core.management.base import BaseCommand from optparse import make_option -from mygpo.api.models import Podcast, PodcastGroup, ToplistEntry, Subscription, SubscriptionMeta -from django.db.models import Count +from mygpo.api.models import Podcast, PodcastGroup, ToplistEntry class Command(BaseCommand): diff --git a/mygpo/data/mimetype.py b/mygpo/data/mimetype.py index 12e2201b..d60ead45 100644 --- a/mygpo/data/mimetype.py +++ b/mygpo/data/mimetype.py @@ -1,4 +1,4 @@ -from mygpo.api.models import Podcast, Episode +from mygpo.api.models import Episode from collections import defaultdict import mimetypes diff --git a/mygpo/data/models.py b/mygpo/data/models.py index c047f4c6..e71516e4 100755 --- a/mygpo/data/models.py +++ b/mygpo/data/models.py @@ -1,6 +1,6 @@ from django.db import models from django.contrib.auth.models import User -from mygpo.api.models import Podcast, Episode, Device, ToplistEntry, PodcastGroup +from mygpo.api.models import Podcast, Episode, Device, PodcastGroup from mygpo import settings diff --git a/mygpo/data/podcast.py b/mygpo/data/podcast.py index 12736a06..8a462b30 100644 --- a/mygpo/data/podcast.py +++ b/mygpo/data/podcast.py @@ -16,7 +16,7 @@ # from django.contrib.auth.models import User -from mygpo.api.models import Podcast, Episode, Subscription +from mygpo.api.models import Episode, Subscription from mygpo.data.models import PodcastTag def avg_update_interval(podcast): diff --git a/mygpo/data/signals.py b/mygpo/data/signals.py index 37c86b6d..c84966ad 100644 --- a/mygpo/data/signals.py +++ b/mygpo/data/signals.py @@ -1,4 +1,3 @@ -from django.db.models.signals import post_save, pre_delete from mygpo.data.models import DirectoryEntry from mygpo.data.directory import get_source_weights, get_weighted_tags, get_weighted_group_tags diff --git a/mygpo/publisher/auth.py b/mygpo/publisher/auth.py index 3249fe48..43316c95 100644 --- a/mygpo/publisher/auth.py +++ b/mygpo/publisher/auth.py @@ -15,8 +15,7 @@ # along with my.gpodder.org. If not, see . # -from django.http import HttpResponse, HttpResponseRedirect -from django.contrib.auth import authenticate, login +from django.http import HttpResponseRedirect from mygpo.publisher.models import PodcastPublisher diff --git a/mygpo/publisher/management/commands/make-publisher.py b/mygpo/publisher/management/commands/make-publisher.py index 97f90e16..20297cef 100644 --- a/mygpo/publisher/management/commands/make-publisher.py +++ b/mygpo/publisher/management/commands/make-publisher.py @@ -1,5 +1,4 @@ from django.core.management.base import BaseCommand -from mygpo.data.historic import calc_podcast from mygpo.api.models import Podcast from django.contrib.auth.models import User from mygpo.publisher.models import PodcastPublisher diff --git a/mygpo/publisher/templatetags/pcharts.py b/mygpo/publisher/templatetags/pcharts.py index 4c1259b8..185acc62 100644 --- a/mygpo/publisher/templatetags/pcharts.py +++ b/mygpo/publisher/templatetags/pcharts.py @@ -3,8 +3,6 @@ from django.utils.safestring import mark_safe from django.utils.translation import ugettext as _ from mygpo.publisher.utils import colour_repr from mygpo.utils import format_time -import hashlib -import math register = template.Library() diff --git a/mygpo/publisher/views.py b/mygpo/publisher/views.py index 55b9d635..238bc045 100644 --- a/mygpo/publisher/views.py +++ b/mygpo/publisher/views.py @@ -1,8 +1,7 @@ from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden -from mygpo.api.models import Podcast, Episode, EpisodeAction, PodcastGroup -from django.contrib.auth.decorators import login_required +from mygpo.api.models import Podcast, Episode, PodcastGroup from mygpo.publisher.models import PodcastPublisher from mygpo.publisher.auth import require_publisher, is_publisher from mygpo.publisher.forms import SearchPodcastForm, EpisodeForm, PodcastForm diff --git a/mygpo/search/management/commands/build-search-index.py b/mygpo/search/management/commands/build-search-index.py index 34eb98bc..6b25c9f3 100644 --- a/mygpo/search/management/commands/build-search-index.py +++ b/mygpo/search/management/commands/build-search-index.py @@ -1,5 +1,4 @@ from django.core.management.base import BaseCommand -from optparse import make_option from mygpo.search.models import SearchEntry from mygpo.api.models import ToplistEntry diff --git a/mygpo/search/signals.py b/mygpo/search/signals.py index 1aa1089a..3000bef3 100644 --- a/mygpo/search/signals.py +++ b/mygpo/search/signals.py @@ -1,6 +1,3 @@ -from django.db.models.signals import post_save, pre_delete -from mygpo.api.models import Podcast, PodcastGroup - def remove_podcast_entry(sender, instance=False, **kwargs): from mygpo.search.models import SearchEntry diff --git a/mygpo/search/util.py b/mygpo/search/util.py index 1e5c9e13..dd59209e 100644 --- a/mygpo/search/util.py +++ b/mygpo/search/util.py @@ -1,5 +1,3 @@ -from django.db.models import Count -from mygpo.api.models import Subscription, Podcast from mygpo.data.models import PodcastTag def tag_string(tags, max_length=200): diff --git a/mygpo/security.py b/mygpo/security.py index c094dd25..1fa784dc 100644 --- a/mygpo/security.py +++ b/mygpo/security.py @@ -16,7 +16,6 @@ # along with my.gpodder.org. If not, see . # -from django.http import HttpResponse from django.shortcuts import render_to_response from django.template import RequestContext from django.contrib.sites.models import Site diff --git a/mygpo/userfeeds/views.py b/mygpo/userfeeds/views.py index 1e1cee29..799dc024 100644 --- a/mygpo/userfeeds/views.py +++ b/mygpo/userfeeds/views.py @@ -3,7 +3,6 @@ from django.template import RequestContext from django.contrib.auth.models import User from django.contrib.sites.models import Site from mygpo.userfeeds.auth import require_token_auth -from mygpo.web.models import SecurityToken from mygpo.userfeeds.feeds import FavoriteFeed @require_token_auth('fav-feed', 'r') diff --git a/mygpo/utils.py b/mygpo/utils.py index 77eb8fa3..9664ae13 100644 --- a/mygpo/utils.py +++ b/mygpo/utils.py @@ -15,7 +15,7 @@ # along with my.gpodder.org. If not, see . # -from datetime import datetime, timedelta, time +from datetime import datetime, timedelta import time def daterange(from_date, to_date=datetime.now(), leap=timedelta(days=1)): diff --git a/mygpo/web/admin.py b/mygpo/web/admin.py index 24351a0f..4514ca25 100644 --- a/mygpo/web/admin.py +++ b/mygpo/web/admin.py @@ -16,6 +16,6 @@ # from django.contrib import admin -from mygpo.web.models import * +from mygpo.web.models import SecurityToken admin.site.register(SecurityToken) diff --git a/mygpo/web/forms.py b/mygpo/web/forms.py index b47caa82..d99213fc 100644 --- a/mygpo/web/forms.py +++ b/mygpo/web/forms.py @@ -1,6 +1,5 @@ from django import forms from django.utils.translation import ugettext as _ -from django.forms.util import ValidationError from mygpo.api.models import Device, DEVICE_TYPES, SyncGroup from mygpo.log import log import re diff --git a/mygpo/web/templatetags/charts.py b/mygpo/web/templatetags/charts.py index ac49062d..6d688917 100644 --- a/mygpo/web/templatetags/charts.py +++ b/mygpo/web/templatetags/charts.py @@ -1,8 +1,5 @@ from django import template from django.utils.safestring import mark_safe -from django.utils.translation import ugettext as _ -import hashlib -import math register = template.Library() diff --git a/mygpo/web/templatetags/flickr.py b/mygpo/web/templatetags/flickr.py index f6b58713..045d91b2 100644 --- a/mygpo/web/templatetags/flickr.py +++ b/mygpo/web/templatetags/flickr.py @@ -1,6 +1,5 @@ from django import template from django.utils.safestring import mark_safe -from mygpo.data import youtube from mygpo.data import flickr register = template.Library() diff --git a/mygpo/web/templatetags/math.py b/mygpo/web/templatetags/math.py index 1034478b..a7a33d3d 100644 --- a/mygpo/web/templatetags/math.py +++ b/mygpo/web/templatetags/math.py @@ -1,7 +1,4 @@ from django import template -from django.utils.safestring import mark_safe -from django.utils.translation import ugettext as _ -import hashlib register = template.Library() diff --git a/mygpo/web/templatetags/mygpoutil.py b/mygpo/web/templatetags/mygpoutil.py index 95f57b29..e2d91b68 100644 --- a/mygpo/web/templatetags/mygpoutil.py +++ b/mygpo/web/templatetags/mygpoutil.py @@ -1,7 +1,6 @@ from django import template from django.utils.safestring import mark_safe -from django.utils.translation import ugettext as _ import re from htmlentitydefs import entitydefs diff --git a/mygpo/web/templatetags/time.py b/mygpo/web/templatetags/time.py index 3e178d59..05eaaf32 100644 --- a/mygpo/web/templatetags/time.py +++ b/mygpo/web/templatetags/time.py @@ -1,5 +1,4 @@ from django import template -from django.utils.translation import ugettext as _ from datetime import time register = template.Library() diff --git a/mygpo/web/templatetags/utils.py b/mygpo/web/templatetags/utils.py index be7e0cd3..a335486d 100644 --- a/mygpo/web/templatetags/utils.py +++ b/mygpo/web/templatetags/utils.py @@ -1,6 +1,5 @@ from django import template from django.utils.safestring import mark_safe -from django.utils.translation import ugettext as _ from mygpo.web.utils import get_page_list register = template.Library() diff --git a/mygpo/web/urls.py b/mygpo/web/urls.py index 2763fec3..7d97abf7 100644 --- a/mygpo/web/urls.py +++ b/mygpo/web/urls.py @@ -1,7 +1,6 @@ from django.conf.urls.defaults import * from registration.views import activate, register from registration.forms import RegistrationFormUniqueEmail -from registration.backends import default from django.contrib.auth.views import logout from django.views.generic.simple import direct_to_template diff --git a/mygpo/web/views/device.py b/mygpo/web/views/device.py index 58501abc..3f9cb766 100644 --- a/mygpo/web/views/device.py +++ b/mygpo/web/views/device.py @@ -16,27 +16,18 @@ # from django.shortcuts import render_to_response -from django.http import HttpResponseRedirect, HttpResponse, HttpResponseBadRequest, HttpResponseForbidden -from django.contrib.auth.models import User +from django.http import HttpResponseRedirect, HttpResponseBadRequest, HttpResponseForbidden from django.template import RequestContext -from mygpo.api.models import Podcast, Episode, Device, EpisodeAction, SubscriptionAction, ToplistEntry, EpisodeToplistEntry, Subscription, SuggestionEntry, SyncGroup, SUBSCRIBE_ACTION, UNSUBSCRIBE_ACTION, SubscriptionMeta +from mygpo.api.models import Device, EpisodeAction, SubscriptionAction from mygpo.data.models import BackendSubscription, Listener from mygpo.web.forms import DeviceForm, SyncForm -from django.forms import ValidationError from django.utils.translation import ugettext as _ from django.contrib.auth.decorators import login_required from django.shortcuts import get_object_or_404 from django.db import IntegrityError -from datetime import datetime, date, timedelta -from django.contrib.sites.models import Site -from mygpo.api.sanitizing import sanitize_url from mygpo.log import log -from mygpo.utils import daterange from mygpo.api import simple from mygpo.decorators import manual_gc, allowed_methods -import re -import random -import string @manual_gc diff --git a/mygpo/web/views/episode.py b/mygpo/web/views/episode.py index 3158ea0e..b944849a 100644 --- a/mygpo/web/views/episode.py +++ b/mygpo/web/views/episode.py @@ -16,19 +16,17 @@ # from django.shortcuts import render_to_response -from django.http import HttpResponseRedirect, HttpResponse, HttpResponseBadRequest, HttpResponseForbidden +from django.http import HttpResponseRedirect from django.template import RequestContext -from mygpo.api.models import Podcast, Episode, Device, EpisodeAction, Subscription +from mygpo.api.models import Podcast, Episode, EpisodeAction, Subscription from mygpo.api.models.episodes import Chapter from mygpo.api.models.users import EpisodeFavorite from mygpo.web.models import SecurityToken from mygpo.web.utils import get_played_parts from mygpo.decorators import manual_gc from mygpo.utils import parse_time -from django.utils.translation import ugettext as _ from django.contrib.auth.decorators import login_required from django.shortcuts import get_object_or_404 -from datetime import datetime, date, timedelta from django.contrib.sites.models import Site import random import string diff --git a/mygpo/web/views/public.py b/mygpo/web/views/public.py index 970462ba..f33f772f 100644 --- a/mygpo/web/views/public.py +++ b/mygpo/web/views/public.py @@ -16,17 +16,13 @@ # from django.shortcuts import render_to_response -from django.http import HttpResponseRedirect, HttpResponse, HttpResponseBadRequest, HttpResponseForbidden +from django.http import HttpResponseRedirect from django.template import RequestContext -from mygpo.api.models import Podcast, Episode, Subscription from mygpo.api import backend -from mygpo.data.models import PodcastTag, DirectoryEntry +from mygpo.data.models import DirectoryEntry from mygpo.data.mimetype import CONTENT_TYPES from mygpo.decorators import manual_gc from mygpo.web import utils -from mygpo import settings -from django.shortcuts import get_object_or_404 -from django.db.models import Sum from django.contrib.sites.models import Site from django.core.paginator import Paginator, InvalidPage, EmptyPage diff --git a/mygpo/web/views/settings.py b/mygpo/web/views/settings.py index 3fe85330..b89546cf 100644 --- a/mygpo/web/views/settings.py +++ b/mygpo/web/views/settings.py @@ -16,7 +16,6 @@ # from django.shortcuts import render_to_response -from django.http import HttpResponseRedirect from django.contrib.auth import logout from django.template import RequestContext from mygpo.api.models import Podcast, Subscription, SubscriptionMeta @@ -24,10 +23,8 @@ from mygpo.web.models import SecurityToken from mygpo.web.forms import UserAccountForm from django.forms import ValidationError from django.utils.translation import ugettext as _ -from mygpo.api.basic_auth import require_valid_user from mygpo.decorators import manual_gc, allowed_methods from django.contrib.auth.decorators import login_required -from django.shortcuts import get_object_or_404 from django.contrib.sites.models import Site diff --git a/mygpo/web/views/users.py b/mygpo/web/views/users.py index 1ef577be..2215e958 100644 --- a/mygpo/web/views/users.py +++ b/mygpo/web/views/users.py @@ -17,17 +17,15 @@ from django.shortcuts import render_to_response from django.http import HttpResponseRedirect -from django.contrib.auth import authenticate, login, logout -from django.contrib.auth.models import User +from django.contrib.auth import authenticate, login from django.contrib.auth.decorators import login_required from django.template.defaultfilters import slugify from django.template import RequestContext -from registration.views import activate, register from mygpo.api.models import UserProfile from mygpo.web.forms import RestorePasswordForm from django.contrib.sites.models import Site from django.conf import settings -from mygpo.decorators import requires_token, manual_gc, allowed_methods +from mygpo.decorators import manual_gc, allowed_methods from django.utils.translation import ugettext as _ import string import random -- 2.11.4.GIT