From 3431d700830feb1dd3ba4147f1c34bb331541bb8 Mon Sep 17 00:00:00 2001 From: Nick Sergeant Date: Fri, 24 Jul 2015 21:39:25 -0400 Subject: [PATCH] Sort and organize imports. --- accounts/admin.py | 3 +-- accounts/models.py | 2 +- accounts/urls.py | 3 +-- accounts/views.py | 10 ++++----- admin.py | 2 +- blogs/middleware.py | 17 +++++++++----- blogs/models.py | 0 blogs/views.py | 11 +++++---- snipts/admin.py | 1 - snipts/api.py | 37 +++++++++++++++---------------- snipts/models.py | 30 +++++++++++-------------- snipts/search_indexes.py | 1 + snipts/templatetags/snipt_tags.py | 13 +++++------ snipts/tests.py | 4 ++-- snipts/urls.py | 1 - snipts/utils.py | 6 ++--- snipts/views.py | 22 +++++++++--------- urls.py | 9 ++++---- utils/forms.py | 4 ++-- utils/templatetags/intercom.py | 6 ++--- views.py | 30 ++++++++++++------------- 21 files changed, 101 insertions(+), 111 deletions(-) delete mode 100644 blogs/models.py diff --git a/accounts/admin.py b/accounts/admin.py index 7d99a81..69be4f6 100644 --- a/accounts/admin.py +++ b/accounts/admin.py @@ -1,6 +1,5 @@ -from django.contrib import admin - from accounts.models import UserProfile +from django.contrib import admin class UserProfileAdmin(admin.ModelAdmin): diff --git a/accounts/models.py b/accounts/models.py index ed3a0fa..1180607 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -1,5 +1,5 @@ -from django.contrib.auth.models import User from datetime import datetime +from django.contrib.auth.models import User from django.db import models from snipts.models import Snipt diff --git a/accounts/urls.py b/accounts/urls.py index c2e6be8..f457ecb 100644 --- a/accounts/urls.py +++ b/accounts/urls.py @@ -1,6 +1,5 @@ -from django.conf.urls import * - from accounts import views +from django.conf.urls import * urlpatterns = \ patterns('', diff --git a/accounts/views.py b/accounts/views.py index ee97f5c..d322c12 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -1,11 +1,11 @@ -from django.conf import settings -from django.contrib.auth.decorators import login_required -from annoying.decorators import ajax_request, render_to -from snipts.models import Snipt - import os import stripe +from annoying.decorators import ajax_request, render_to +from django.conf import settings +from django.contrib.auth.decorators import login_required +from snipts.models import Snipt + @login_required @render_to('account.html') diff --git a/admin.py b/admin.py index 1d076e9..bf0016d 100644 --- a/admin.py +++ b/admin.py @@ -1,6 +1,6 @@ +from django.contrib import admin from django.contrib.auth.admin import UserAdmin from django.contrib.auth.models import User -from django.contrib import admin class UserAdmin(UserAdmin): diff --git a/blogs/middleware.py b/blogs/middleware.py index d18fd8c..644032c 100644 --- a/blogs/middleware.py +++ b/blogs/middleware.py @@ -1,8 +1,7 @@ +from annoying.functions import get_object_or_None +from django.contrib.auth.models import User from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404 -from django.contrib.auth.models import User - -from annoying.functions import get_object_or_None class BlogMiddleware: @@ -28,7 +27,8 @@ class BlogMiddleware: if request.blog_user is None: request.blog_user = \ get_object_or_404(User, - username__iexact=blog_user.replace('-', '_')) + username__iexact=blog_user + .replace('-', '_')) else: request.blog_user = \ get_object_or_404(User, username__iexact=blog_user) @@ -41,5 +41,10 @@ class BlogMiddleware: if host in pro_user.profile.blog_domain.split(' '): request.blog_user = pro_user - if host != pro_user.profile.get_primary_blog_domain(): - return HttpResponseRedirect('http://' + pro_user.profile.get_primary_blog_domain()) + if host != \ + pro_user.profile.get_primary_blog_domain(): + return HttpResponseRedirect( + 'http://' + + pro_user + .profile + .get_primary_blog_domain()) diff --git a/blogs/models.py b/blogs/models.py deleted file mode 100644 index e69de29..0000000 diff --git a/blogs/views.py b/blogs/views.py index db254fe..feec4db 100644 --- a/blogs/views.py +++ b/blogs/views.py @@ -1,11 +1,10 @@ -from django.shortcuts import get_object_or_404, render_to_response -from annoying.functions import get_object_or_None -from django.template import RequestContext - -from snipts.models import Snipt - import datetime +from annoying.functions import get_object_or_None +from django.shortcuts import get_object_or_404, render_to_response +from django.template import RequestContext +from snipts.models import Snipt + THEME_CHOICES = { 'D': 'blogs/themes/default/', 'A': 'blogs/themes/pro-adams/', diff --git a/snipts/admin.py b/snipts/admin.py index 734517f..dcbc7cc 100644 --- a/snipts/admin.py +++ b/snipts/admin.py @@ -1,5 +1,4 @@ from django.contrib import admin - from snipts.models import Favorite, Snipt diff --git a/snipts/api.py b/snipts/api.py index dbf2c3c..0144089 100644 --- a/snipts/api.py +++ b/snipts/api.py @@ -1,27 +1,26 @@ -from taggit.utils import edit_string_for_tags, parse_tags -from tastypie.authentication import ApiKeyAuthentication -from tastypie.authorization import Authorization -from django.template.defaultfilters import date, urlize, linebreaksbr -from tastypie.resources import ModelResource -from tastypie.exceptions import Unauthorized -from django.contrib.auth.models import User -from tastypie.validation import Validation -from tastypie.models import create_api_key -from snipts.models import Favorite, Snipt -from haystack.query import SearchQuerySet -from accounts.models import UserProfile -from tastypie.cache import SimpleCache -from tastypie.fields import ListField -from taggit.models import Tag -from django.db import models -from tastypie import fields - import datetime import hashlib +import parsedatetime as pdt import re import time -import parsedatetime as pdt +from accounts.models import UserProfile +from django.contrib.auth.models import User +from django.db import models +from django.template.defaultfilters import date, urlize, linebreaksbr +from haystack.query import SearchQuerySet +from snipts.models import Favorite, Snipt +from taggit.models import Tag +from taggit.utils import edit_string_for_tags, parse_tags +from tastypie import fields +from tastypie.authentication import ApiKeyAuthentication +from tastypie.authorization import Authorization +from tastypie.cache import SimpleCache +from tastypie.exceptions import Unauthorized +from tastypie.fields import ListField +from tastypie.models import create_api_key +from tastypie.resources import ModelResource +from tastypie.validation import Validation models.signals.post_save.connect(create_api_key, sender=User) diff --git a/snipts/models.py b/snipts/models.py index b3725f7..af5b23a 100644 --- a/snipts/models.py +++ b/snipts/models.py @@ -1,25 +1,21 @@ -from annoying.functions import get_object_or_None - -from django.contrib.auth.models import User -from django.conf import settings -from django.db import models - -from taggit.managers import TaggableManager -from taggit.utils import edit_string_for_tags - -from markdown_deux import markdown -from pygments import highlight -from pygments.lexers import get_lexer_by_name -from pygments.util import ClassNotFound -from pygments.formatters import HtmlFormatter - -from snipts.utils import slugify_uniquely - import datetime import hashlib import random import re +from annoying.functions import get_object_or_None +from django.conf import settings +from django.contrib.auth.models import User +from django.db import models +from markdown_deux import markdown +from pygments import highlight +from pygments.formatters import HtmlFormatter +from pygments.lexers import get_lexer_by_name +from pygments.util import ClassNotFound +from snipts.utils import slugify_uniquely +from taggit.managers import TaggableManager +from taggit.utils import edit_string_for_tags + class Snipt(models.Model): """An individual Snipt.""" diff --git a/snipts/search_indexes.py b/snipts/search_indexes.py index 120ddf7..0573891 100644 --- a/snipts/search_indexes.py +++ b/snipts/search_indexes.py @@ -1,4 +1,5 @@ import datetime + from haystack import indexes from snipts.models import Snipt diff --git a/snipts/templatetags/snipt_tags.py b/snipts/templatetags/snipt_tags.py index 4a300f1..4890f2f 100644 --- a/snipts/templatetags/snipt_tags.py +++ b/snipts/templatetags/snipt_tags.py @@ -1,13 +1,10 @@ -from django import template - -from templatetag_sugar.register import tag -from templatetag_sugar.parser import Variable, Constant - -from snipts.models import Favorite, Snipt -from snipts.utils import get_lexers_list - import hashlib +from django import template +from snipts.models import Favorite, Snipt +from snipts.utils import get_lexers_list +from templatetag_sugar.parser import Variable, Constant +from templatetag_sugar.register import tag register = template.Library() diff --git a/snipts/tests.py b/snipts/tests.py index 1e7f08a..7894f41 100644 --- a/snipts/tests.py +++ b/snipts/tests.py @@ -1,7 +1,7 @@ from django.contrib.auth.models import User -from tastypie.test import ResourceTestCase -from tastypie.models import ApiKey from snipts.models import Snipt +from tastypie.models import ApiKey +from tastypie.test import ResourceTestCase class SniptResourceTest(ResourceTestCase): diff --git a/snipts/urls.py b/snipts/urls.py index ee9bbbb..f51ec62 100644 --- a/snipts/urls.py +++ b/snipts/urls.py @@ -1,5 +1,4 @@ from django.conf.urls import * - from snipts import views diff --git a/snipts/utils.py b/snipts/utils.py index 909b4fc..a0774b3 100644 --- a/snipts/utils.py +++ b/snipts/utils.py @@ -1,9 +1,9 @@ +import uuid + from django.contrib.auth import authenticate, login from django.template.defaultfilters import slugify -from registration.signals import user_registered from pygments.lexers import get_all_lexers - -import uuid +from registration.signals import user_registered def slugify_uniquely(value, model, slugfield="slug"): diff --git a/snipts/views.py b/snipts/views.py index 5640e11..4dbbcbe 100644 --- a/snipts/views.py +++ b/snipts/views.py @@ -1,21 +1,19 @@ -from django.http import Http404, HttpResponse, HttpResponseRedirect -from django.shortcuts import get_object_or_404, render_to_response -from django.core.paginator import Paginator, InvalidPage -from annoying.functions import get_object_or_None -from pygments.lexers import get_lexer_by_name -from django.contrib.auth.models import User -from django.template import RequestContext from annoying.decorators import render_to -from snipts.models import Favorite, Snipt -from django.db.models import Count +from annoying.functions import get_object_or_None from blogs.views import blog_list from django.conf import settings +from django.contrib.auth.models import User +from django.core.paginator import Paginator, InvalidPage +from django.db.models import Count from django.db.models import Q -from taggit.models import Tag - +from django.http import Http404, HttpResponse, HttpResponseRedirect +from django.shortcuts import get_object_or_404, render_to_response +from django.template import RequestContext from haystack.forms import ModelSearchForm from haystack.query import EmptySearchQuerySet, SearchQuerySet - +from pygments.lexers import get_lexer_by_name +from snipts.models import Favorite, Snipt +from taggit.models import Tag RESULTS_PER_PAGE = getattr(settings, 'HAYSTACK_SEARCH_RESULTS_PER_PAGE', 20) diff --git a/urls.py b/urls.py index 1b2fb91..b1b37e8 100644 --- a/urls.py +++ b/urls.py @@ -1,7 +1,9 @@ +import os + from django.conf.urls import include, patterns, url -from django.views.generic import TemplateView -from django.http import HttpResponseRedirect from django.contrib import admin +from django.http import HttpResponseRedirect +from django.views.generic import TemplateView from snipts.api import (PublicSniptResource, PublicUserResource, PrivateSniptResource, PrivateFavoriteResource, PrivateUserProfileResource, @@ -12,9 +14,6 @@ from utils.views import SniptRegistrationView from views import (homepage, lexers, login_redirect, pro, sitemap, tags, pro_complete, user_api_key, for_teams, for_teams_complete) -import os - - admin.autodiscover() public_api = Api(api_name='public') diff --git a/utils/forms.py b/utils/forms.py index 81a1525..80ede7f 100644 --- a/utils/forms.py +++ b/utils/forms.py @@ -1,7 +1,7 @@ +from django import forms +from django.contrib.auth.models import User from django.utils.translation import ugettext_lazy as _ from registration.forms import RegistrationForm -from django.contrib.auth.models import User -from django import forms class SniptRegistrationForm(RegistrationForm): diff --git a/utils/templatetags/intercom.py b/utils/templatetags/intercom.py index da1e58f..0525c44 100644 --- a/utils/templatetags/intercom.py +++ b/utils/templatetags/intercom.py @@ -1,10 +1,10 @@ -from django.conf import settings -from django import template - import hmac import hashlib import os +from django import template +from django.conf import settings + register = template.Library() diff --git a/views.py b/views.py index fb233c3..6bb206a 100644 --- a/views.py +++ b/views.py @@ -1,23 +1,23 @@ -from accounts.models import UserProfile -from annoying.decorators import ajax_request, render_to -from blogs.views import blog_list -from django.http import HttpResponseRedirect, HttpResponseBadRequest -from django.conf import settings -from django.contrib.auth.decorators import login_required -from django.shortcuts import render_to_response -from django.template import RequestContext -from snipts.utils import get_lexers_list -from django.contrib.auth.models import User -from django.db.models import Count -from snipts.models import Snipt -from taggit.models import Tag -from django.core.mail import send_mail - import datetime import hashlib import os import stripe +from accounts.models import UserProfile +from annoying.decorators import ajax_request, render_to +from blogs.views import blog_list +from django.conf import settings +from django.contrib.auth.decorators import login_required +from django.contrib.auth.models import User +from django.core.mail import send_mail +from django.db.models import Count +from django.http import HttpResponseRedirect, HttpResponseBadRequest +from django.shortcuts import render_to_response +from django.template import RequestContext +from snipts.models import Snipt +from snipts.utils import get_lexers_list +from taggit.models import Tag + @render_to('for-teams.html') def for_teams(request):