From f35c6d24ea1b8fb9bfef6e1a3177a79c2f1e72e8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20K=C3=B6gl?= Date: Sun, 31 Aug 2014 10:59:01 +0200 Subject: [PATCH] [Users] clean up imports --- mygpo/share/models.py | 2 +- mygpo/users/models.py | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/mygpo/share/models.py b/mygpo/share/models.py index e956ee8d..5458e2a0 100644 --- a/mygpo/share/models.py +++ b/mygpo/share/models.py @@ -7,7 +7,7 @@ from couchdbkit.ext.django.schema import * from django.core.urlresolvers import reverse from mygpo.core.proxy import DocumentABCMeta -from mygpo.users.models import RatingMixin +from mygpo.users.ratings import RatingMixin from mygpo.flattr import FlattrThing diff --git a/mygpo/users/models.py b/mygpo/users/models.py index 11b7bf7c..9ab35bde 100644 --- a/mygpo/users/models.py +++ b/mygpo/users/models.py @@ -6,32 +6,23 @@ import collections from datetime import datetime import dateutil.parser from itertools import imap -import random import string from couchdbkit.ext.django.schema import * from uuidfield import UUIDField -from django.core.exceptions import ValidationError from django.core.validators import RegexValidator from django.db import transaction, models from django.db.models import Q from django.contrib.auth.models import User as DjangoUser -from django.contrib.auth import get_user_model from django.utils.translation import ugettext_lazy as _ from django.conf import settings -from django.core.cache import cache -from django.contrib import messages from mygpo.core.models import (TwitterModel, UUIDModel, SettingsModel, GenericManager, DeleteableModel, ) from mygpo.podcasts.models import Podcast, Episode from mygpo.utils import random_token -from mygpo.core.proxy import DocumentABCMeta, proxy_object -from mygpo.users.ratings import RatingMixin -from mygpo.users.subscriptions import subscription_changes -from mygpo.users.settings import FAV_FLAG, PUBLIC_SUB_PODCAST, SettingsMixin -from mygpo.db.couchdb.user import user_history, device_history +from mygpo.users.settings import FAV_FLAG, SettingsMixin import logging logger = logging.getLogger(__name__) -- 2.11.4.GIT