From 377b9d59f96147fb5254b4838a3c320fb06db401 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Stefan=20K=C3=B6gl?= <stefan@skoegl.net>
Date: Fri, 12 Oct 2012 10:44:09 +0200
Subject: [PATCH] remove unused imports

---
 mygpo/admin/views.py             |  1 -
 mygpo/core/models.py             | 16 +---------------
 mygpo/directory/models.py        |  2 --
 mygpo/directory/views.py         | 19 +++++++++----------
 mygpo/publisher/views.py         |  1 -
 mygpo/share/models.py            |  3 ---
 mygpo/share/views.py             |  1 -
 mygpo/users/models.py            |  7 ++-----
 mygpo/utils.py                   |  2 --
 mygpo/web/views/__init__.py      | 16 ++++++----------
 mygpo/web/views/device.py        |  9 ++++-----
 mygpo/web/views/episode.py       |  5 -----
 mygpo/web/views/podcast.py       |  6 ++----
 mygpo/web/views/settings.py      |  4 ++--
 mygpo/web/views/subscriptions.py | 11 +++++------
 mygpo/web/views/users.py         |  5 -----
 16 files changed, 31 insertions(+), 77 deletions(-)

diff --git a/mygpo/admin/views.py b/mygpo/admin/views.py
index a679a6fd..09247cd1 100644
--- a/mygpo/admin/views.py
+++ b/mygpo/admin/views.py
@@ -11,7 +11,6 @@ from django.utils.decorators import method_decorator
 
 from mygpo.admin.auth import require_staff
 from mygpo.admin.group import PodcastGrouper
-from mygpo.core.models import Podcast
 from mygpo.counter import Counter
 from mygpo.maintenance.merge import PodcastMerger, IncorrectMergeException
 from mygpo.users.models import User
diff --git a/mygpo/core/models.py b/mygpo/core/models.py
index 1bc775f6..7eb35c54 100644
--- a/mygpo/core/models.py
+++ b/mygpo/core/models.py
@@ -1,16 +1,12 @@
 from __future__ import division
 
 import hashlib
-import os.path
 import re
-from datetime import datetime
-from dateutil import parser
-from random import randint, random
+from random import random
 
 from couchdbkit.ext.django.schema import *
 from restkit.errors import Unauthorized
 
-from django.conf import settings
 from django.core.urlresolvers import reverse
 
 from mygpo.decorators import repeat_on_conflict
@@ -217,16 +213,6 @@ class Podcast(Document, SlugMixin, OldIdMixin):
 
 
 
-    def get_episode_count(self, since=None, until={}, **kwargs):
-
-        # use stored episode count for better performance
-        if getattr(self, 'episode_count', None) is not None:
-            return self.episode_count
-
-        from mygpo.db.couchdb import episode_count_for_podcast
-        return episode_count_for_podcast(self, since, until, **kwargs)
-
-
     def get_common_episode_title(self, num_episodes=100):
 
         if self.common_episode_title:
diff --git a/mygpo/directory/models.py b/mygpo/directory/models.py
index c167da22..bef5072c 100644
--- a/mygpo/directory/models.py
+++ b/mygpo/directory/models.py
@@ -2,10 +2,8 @@ from django.core.cache import cache
 
 from couchdbkit.ext.django.schema import *
 
-from mygpo.core.models import Podcast
 from mygpo.utils import iterate_together
 from mygpo.core.proxy import DocumentABCMeta
-from mygpo.cache import cache_result
 from mygpo.db.couchdb.podcast import podcasts_by_id
 
 
diff --git a/mygpo/directory/views.py b/mygpo/directory/views.py
index 196b3dda..afe90cdc 100644
--- a/mygpo/directory/views.py
+++ b/mygpo/directory/views.py
@@ -1,7 +1,6 @@
 from itertools import imap as map
 from math import ceil
 
-from django.core.cache import cache
 from django.http import HttpResponseNotFound
 from django.shortcuts import render
 from django.contrib.sites.models import RequestSite
@@ -10,12 +9,12 @@ from django.views.decorators.vary import vary_on_cookie
 from django.utils.decorators import method_decorator
 from django.views.generic.base import View
 
-from mygpo.core.models import Podcast
 from mygpo.core.proxy import proxy_object
 from mygpo.directory.toplist import PodcastToplist, EpisodeToplist, \
          TrendingPodcasts
 from mygpo.directory.search import search_podcasts
-from mygpo.web import utils
+from mygpo.web.utils import process_lang_params, get_language_names, \
+         get_page_list
 from mygpo.directory.tags import Topics
 from mygpo.users.models import User
 from mygpo.db.couchdb.podcast import get_podcast_languages, podcasts_by_id, \
@@ -29,7 +28,7 @@ from mygpo.db.couchdb.podcastlist import random_podcastlists, \
 @cache_control(private=True)
 def toplist(request, num=100, lang=None):
 
-    lang = utils.process_lang_params(request)
+    lang = process_lang_params(request)
 
     toplist = PodcastToplist(lang)
     entries = toplist[:num]
@@ -38,7 +37,7 @@ def toplist(request, num=100, lang=None):
     current_site = RequestSite(request)
 
     languages = get_podcast_languages()
-    all_langs = utils.get_language_names(languages)
+    all_langs = get_language_names(languages)
 
     return render(request, 'toplist.html', {
         'entries': entries,
@@ -102,7 +101,7 @@ def category(request, category, page_size=20):
     podcasts = filter(None, entries)
     num_pages = len(category.podcasts) / page_size
 
-    page_list = utils.get_page_list(1, num_pages, page, 15)
+    page_list = get_page_list(1, num_pages, page, 15)
 
     return render(request, 'category.html', {
         'entries': podcasts,
@@ -129,7 +128,7 @@ def search(request, template='search.html', args={}):
         results, total = search_podcasts(q=q, skip=RESULTS_PER_PAGE*(page-1))
         num_pages = total / RESULTS_PER_PAGE
 
-        page_list = utils.get_page_list(1, num_pages, page, 15)
+        page_list = get_page_list(1, num_pages, page, 15)
 
     else:
         results = []
@@ -152,7 +151,7 @@ def search(request, template='search.html', args={}):
 @cache_control(private=True)
 @vary_on_cookie
 def episode_toplist(request, num=100):
-    lang = utils.process_lang_params(request)
+    lang = process_lang_params(request)
 
     toplist = EpisodeToplist(language=lang)
     entries = list(map(proxy_object, toplist[:num]))
@@ -169,7 +168,7 @@ def episode_toplist(request, num=100):
     max_listeners = max([0]+[e.listeners for e in entries])
 
     languages = get_podcast_languages()
-    all_langs = utils.get_language_names(languages)
+    all_langs = get_language_names(languages)
 
     return render(request, 'episode_toplist.html', {
         'entries': entries,
@@ -203,7 +202,7 @@ def podcast_lists(request, page_size=20):
 
     num_pages = int(ceil(podcastlist_count() / float(page_size)))
 
-    page_list = utils.get_page_list(1, num_pages, page, 15)
+    page_list = get_page_list(1, num_pages, page, 15)
 
     return render(request, 'podcast_lists.html', {
         'lists': lists,
diff --git a/mygpo/publisher/views.py b/mygpo/publisher/views.py
index 5c33dba8..aee4c781 100644
--- a/mygpo/publisher/views.py
+++ b/mygpo/publisher/views.py
@@ -7,7 +7,6 @@ from django.views.decorators.cache import never_cache, cache_control
 from django.views.decorators.vary import vary_on_cookie
 from django.core.urlresolvers import reverse
 
-from mygpo.core.models import Podcast
 from mygpo.core.proxy import proxy_object
 from mygpo.publisher.auth import require_publisher, is_publisher
 from mygpo.publisher.forms import SearchPodcastForm
diff --git a/mygpo/share/models.py b/mygpo/share/models.py
index de7078de..d9ab6328 100644
--- a/mygpo/share/models.py
+++ b/mygpo/share/models.py
@@ -2,11 +2,8 @@ from random import random
 
 from couchdbkit.ext.django.schema import *
 
-from django.template.defaultfilters import slugify
-
 from mygpo.core.proxy import DocumentABCMeta
 from mygpo.users.models import RatingMixin
-from mygpo.cache import cache_result
 
 
 
diff --git a/mygpo/share/views.py b/mygpo/share/views.py
index 9cba81c9..c97904f4 100644
--- a/mygpo/share/views.py
+++ b/mygpo/share/views.py
@@ -13,7 +13,6 @@ from django.views.decorators.cache import cache_control
 from django.views.generic.base import View
 from django.utils.decorators import method_decorator
 
-from mygpo.core.models import Podcast
 from mygpo.core.proxy import proxy_object
 from mygpo.api.simple import format_podcast_list
 from mygpo.share.models import PodcastList
diff --git a/mygpo/users/models.py b/mygpo/users/models.py
index 73406e8b..5cd68250 100644
--- a/mygpo/users/models.py
+++ b/mygpo/users/models.py
@@ -7,7 +7,6 @@ from operator import itemgetter
 import random
 import string
 
-from couchdbkit import ResourceNotFound
 from couchdbkit.ext.django.schema import *
 
 from django.core.cache import cache
@@ -15,14 +14,12 @@ from django.core.cache import cache
 from django_couchdb_utils.registration.models import User as BaseUser
 
 from mygpo.core.models import Podcast
-from mygpo.utils import linearize, iterate_together
+from mygpo.utils import linearize
 from mygpo.core.proxy import DocumentABCMeta, proxy_object
 from mygpo.decorators import repeat_on_conflict
 from mygpo.users.ratings import RatingMixin
 from mygpo.users.sync import SyncedDevicesMixin
-from mygpo.cache import cache_result
-from mygpo.db.couchdb.podcast import podcast_by_id, podcasts_by_id, \
-         podcasts_to_dict
+from mygpo.db.couchdb.podcast import podcasts_by_id, podcasts_to_dict
 from mygpo.db.couchdb.user import user_history, device_history
 
 
diff --git a/mygpo/utils.py b/mygpo/utils.py
index 5c6c891a..e66634f5 100644
--- a/mygpo/utils.py
+++ b/mygpo/utils.py
@@ -23,8 +23,6 @@ from datetime import datetime, timedelta, date
 import time
 import hashlib
 
-from django.core.cache import cache
-
 
 def daterange(from_date, to_date=None, leap=timedelta(days=1)):
     """
diff --git a/mygpo/web/views/__init__.py b/mygpo/web/views/__init__.py
index 61683a52..bff93884 100644
--- a/mygpo/web/views/__init__.py
+++ b/mygpo/web/views/__init__.py
@@ -18,7 +18,6 @@
 import sys
 from collections import defaultdict
 from datetime import datetime, timedelta
-from itertools import islice
 
 import gevent
 
@@ -34,18 +33,15 @@ from django.views.decorators.vary import vary_on_cookie
 from django.views.decorators.cache import never_cache, cache_control
 
 from mygpo.decorators import repeat_on_conflict
-from mygpo.core import models
-from mygpo.core.models import Podcast
 from mygpo.core.podcasts import PodcastSet
 from mygpo.directory.toplist import PodcastToplist
-from mygpo.users.models import Suggestions, History, HistoryEntry, DeviceDoesNotExist
-from mygpo.users.models import PodcastUserState, User
-from mygpo.web import utils
-from mygpo.utils import flatten, parse_range
+from mygpo.users.models import Suggestions, History, HistoryEntry, \
+         DeviceDoesNotExist
+from mygpo.web.utils import process_lang_params
+from mygpo.utils import parse_range
 from mygpo.web.views.podcast import slug_id_decorator
 from mygpo.db.couchdb.episode import favorite_episodes_for_user
-from mygpo.db.couchdb.podcast import podcast_by_id, \
-         podcast_for_oldid, random_podcasts
+from mygpo.db.couchdb.podcast import podcast_by_id, random_podcasts
 from mygpo.db.couchdb.user import suggestions_for_user
 from mygpo.db.couchdb.directory import tags_for_user
 from mygpo.db.couchdb.podcastlist import podcastlists_for_user
@@ -65,7 +61,7 @@ def home(request):
 def welcome(request):
     current_site = RequestSite(request)
 
-    lang = utils.process_lang_params(request)
+    lang = process_lang_params(request)
 
     toplist = PodcastToplist(lang)
 
diff --git a/mygpo/web/views/device.py b/mygpo/web/views/device.py
index 13d2e314..73269abf 100644
--- a/mygpo/web/views/device.py
+++ b/mygpo/web/views/device.py
@@ -20,10 +20,10 @@ from functools import wraps
 from django.shortcuts import render
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect, HttpResponseBadRequest, \
-        HttpResponseForbidden, Http404, HttpResponseNotFound
+        HttpResponseNotFound
 from django.contrib import messages
 from mygpo.web.forms import DeviceForm, SyncForm
-from mygpo.web import utils
+from mygpo.web.utils import symbian_opml_changes
 from django.utils.translation import ugettext as _
 from django.contrib.auth.decorators import login_required
 from django.views.decorators.vary import vary_on_cookie
@@ -31,10 +31,9 @@ from django.views.decorators.cache import never_cache, cache_control
 
 from restkit.errors import Unauthorized
 
-from mygpo.log import log
 from mygpo.api import simple
 from mygpo.decorators import allowed_methods, repeat_on_conflict
-from mygpo.users.models import PodcastUserState, Device, DeviceUIDException, \
+from mygpo.users.models import Device, DeviceUIDException, \
      DeviceDoesNotExist
 from mygpo.db.couchdb.podcast_state import podcast_states_for_device
 
@@ -232,7 +231,7 @@ def opml(request, device):
 @login_required
 def symbian_opml(request, device):
     subscriptions = simple.get_subscriptions(request.user, device.uid)
-    subscriptions = map(utils.symbian_opml_changes, subscriptions)
+    subscriptions = map(symbian_opml_changes, subscriptions)
 
     response = simple.format_podcast_list(subscriptions, 'opml', request.user.username)
     response['Content-Disposition'] = 'attachment; filename=%s.opml' % device.uid
diff --git a/mygpo/web/views/episode.py b/mygpo/web/views/episode.py
index 08af4d21..79ad3cdc 100644
--- a/mygpo/web/views/episode.py
+++ b/mygpo/web/views/episode.py
@@ -22,21 +22,16 @@ import dateutil.parser
 
 from django.shortcuts import render
 from django.http import HttpResponseRedirect, Http404
-from django.core.urlresolvers import reverse
 from django.contrib.auth.decorators import login_required
 from django.contrib.sites.models import RequestSite
 from django.views.decorators.vary import vary_on_cookie
 from django.views.decorators.cache import never_cache, cache_control
-from django.views.generic.base import View
-from django.utils.decorators import method_decorator
 from django.contrib import messages
 from django.utils.translation import ugettext as _
 
 from mygpo.api.constants import EPISODE_ACTION_TYPES
 from mygpo.decorators import repeat_on_conflict
-from mygpo.core import models
 from mygpo.core.proxy import proxy_object
-from mygpo.core.models import Podcast
 from mygpo.users.models import Chapter, HistoryEntry, EpisodeAction
 from mygpo.utils import parse_time
 from mygpo.web.heatmap import EpisodeHeatmap
diff --git a/mygpo/web/views/podcast.py b/mygpo/web/views/podcast.py
index ef0f21fe..f58c9177 100644
--- a/mygpo/web/views/podcast.py
+++ b/mygpo/web/views/podcast.py
@@ -1,4 +1,3 @@
-from datetime import date, timedelta, datetime
 from functools import wraps, partial
 
 from django.core.urlresolvers import reverse
@@ -11,13 +10,12 @@ from django.contrib import messages
 from django.views.decorators.vary import vary_on_cookie
 from django.views.decorators.cache import never_cache, cache_control
 
-from mygpo.core.models import Podcast, PodcastGroup, SubscriptionException
+from mygpo.core.models import PodcastGroup, SubscriptionException
 from mygpo.core.proxy import proxy_object
 from mygpo.api.sanitizing import sanitize_url
 from mygpo.users.models import HistoryEntry, DeviceDoesNotExist
-from mygpo.web.forms import PrivacyForm, SyncForm
+from mygpo.web.forms import SyncForm
 from mygpo.decorators import allowed_methods, repeat_on_conflict
-from mygpo.utils import daterange
 from mygpo.web.utils import get_podcast_link_target
 from mygpo.log import log
 from mygpo.db.couchdb.episode import episodes_for_podcast
diff --git a/mygpo/web/views/settings.py b/mygpo/web/views/settings.py
index abeb104b..ea54473f 100644
--- a/mygpo/web/views/settings.py
+++ b/mygpo/web/views/settings.py
@@ -29,11 +29,11 @@ from django.views.decorators.cache import never_cache, cache_control
 from django.utils.decorators import method_decorator
 from django.views.generic.base import View
 
-from django_couchdb_utils.auth.models import UsernameException, PasswordException
+from django_couchdb_utils.auth.models import UsernameException, \
+         PasswordException
 
 from mygpo.decorators import allowed_methods, repeat_on_conflict
 from mygpo.web.forms import UserAccountForm
-from mygpo.core.models import Podcast
 from mygpo.db.couchdb.podcast import podcast_by_id, podcasts_to_dict
 from mygpo.db.couchdb.podcast_state import podcast_state_for_user_podcast, \
          subscriptions_by_user
diff --git a/mygpo/web/views/subscriptions.py b/mygpo/web/views/subscriptions.py
index 18f14499..6becc81c 100644
--- a/mygpo/web/views/subscriptions.py
+++ b/mygpo/web/views/subscriptions.py
@@ -6,14 +6,13 @@ from django.contrib.syndication.views import Feed
 from django.utils.translation import ugettext as _
 from django.http import HttpResponse, Http404
 from django.views.decorators.vary import vary_on_cookie
-from django.views.decorators.cache import never_cache, cache_control
+from django.views.decorators.cache import cache_control
 
-from mygpo.core.models import Podcast
 from mygpo.utils import parse_bool, unzip, skip_pairs
 from mygpo.decorators import requires_token
-from mygpo.api import backend, simple
+from mygpo.api import simple
 from mygpo.users.models import HistoryEntry, User
-from mygpo.web import utils
+from mygpo.web.utils import symbian_opml_changes, get_podcast_link_target
 from mygpo.db.couchdb.podcast import podcasts_to_dict
 from mygpo.db.couchdb.podcast_state import subscriptions_by_user
 
@@ -64,7 +63,7 @@ def for_user_opml(request, username):
     subscriptions = user.get_subscribed_podcasts(public=True)
 
     if parse_bool(request.GET.get('symbian', False)):
-        subscriptions = map(utils.symbian_opml_changes, subscriptions)
+        subscriptions = map(symbian_opml_changes, subscriptions)
 
     response = render(request, 'user_subscriptions.opml', {
         'subscriptions': subscriptions,
@@ -176,7 +175,7 @@ class SubscriptionsFeed(Feed):
                         site=self.site)
 
     def item_link(self, item):
-        return utils.get_podcast_link_target(item.podcast)
+        return get_podcast_link_target(item.podcast)
 
     def item_pubdate(self, item):
         return item.timestamp
diff --git a/mygpo/web/views/users.py b/mygpo/web/views/users.py
index 92d5180d..d8ef379e 100644
--- a/mygpo/web/views/users.py
+++ b/mygpo/web/views/users.py
@@ -21,17 +21,12 @@ import random
 from django.shortcuts import render
 from django.http import HttpResponseRedirect
 from django.contrib.auth import authenticate
-from django.contrib.auth.decorators import login_required
-from django.template.defaultfilters import slugify
 from django.contrib import messages
 from django.contrib.sites.models import RequestSite
 from django.conf import settings
 from django.utils.translation import ugettext as _
-from django.views.decorators.vary import vary_on_cookie
 from django.views.decorators.cache import never_cache
 
-from couchdbkit import ResourceConflict
-
 from mygpo.decorators import allowed_methods, repeat_on_conflict
 from mygpo.web.forms import RestorePasswordForm
 from mygpo.users.models import User
-- 
2.11.4.GIT