Sort and organize imports.
parent
6894f44349
commit
3431d70083
|
@ -1,6 +1,5 @@
|
||||||
from django.contrib import admin
|
|
||||||
|
|
||||||
from accounts.models import UserProfile
|
from accounts.models import UserProfile
|
||||||
|
from django.contrib import admin
|
||||||
|
|
||||||
|
|
||||||
class UserProfileAdmin(admin.ModelAdmin):
|
class UserProfileAdmin(admin.ModelAdmin):
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
from django.contrib.auth.models import User
|
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
from django.contrib.auth.models import User
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from snipts.models import Snipt
|
from snipts.models import Snipt
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
from django.conf.urls import *
|
|
||||||
|
|
||||||
from accounts import views
|
from accounts import views
|
||||||
|
from django.conf.urls import *
|
||||||
|
|
||||||
urlpatterns = \
|
urlpatterns = \
|
||||||
patterns('',
|
patterns('',
|
||||||
|
|
|
@ -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 os
|
||||||
import stripe
|
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
|
@login_required
|
||||||
@render_to('account.html')
|
@render_to('account.html')
|
||||||
|
|
2
admin.py
2
admin.py
|
@ -1,6 +1,6 @@
|
||||||
|
from django.contrib import admin
|
||||||
from django.contrib.auth.admin import UserAdmin
|
from django.contrib.auth.admin import UserAdmin
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.contrib import admin
|
|
||||||
|
|
||||||
|
|
||||||
class UserAdmin(UserAdmin):
|
class UserAdmin(UserAdmin):
|
||||||
|
|
|
@ -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.http import HttpResponseRedirect
|
||||||
from django.shortcuts import get_object_or_404
|
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:
|
class BlogMiddleware:
|
||||||
|
@ -28,7 +27,8 @@ class BlogMiddleware:
|
||||||
if request.blog_user is None:
|
if request.blog_user is None:
|
||||||
request.blog_user = \
|
request.blog_user = \
|
||||||
get_object_or_404(User,
|
get_object_or_404(User,
|
||||||
username__iexact=blog_user.replace('-', '_'))
|
username__iexact=blog_user
|
||||||
|
.replace('-', '_'))
|
||||||
else:
|
else:
|
||||||
request.blog_user = \
|
request.blog_user = \
|
||||||
get_object_or_404(User, username__iexact=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(' '):
|
if host in pro_user.profile.blog_domain.split(' '):
|
||||||
request.blog_user = pro_user
|
request.blog_user = pro_user
|
||||||
|
|
||||||
if host != pro_user.profile.get_primary_blog_domain():
|
if host != \
|
||||||
return HttpResponseRedirect('http://' + pro_user.profile.get_primary_blog_domain())
|
pro_user.profile.get_primary_blog_domain():
|
||||||
|
return HttpResponseRedirect(
|
||||||
|
'http://' +
|
||||||
|
pro_user
|
||||||
|
.profile
|
||||||
|
.get_primary_blog_domain())
|
||||||
|
|
|
@ -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
|
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 = {
|
THEME_CHOICES = {
|
||||||
'D': 'blogs/themes/default/',
|
'D': 'blogs/themes/default/',
|
||||||
'A': 'blogs/themes/pro-adams/',
|
'A': 'blogs/themes/pro-adams/',
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
|
||||||
from snipts.models import Favorite, Snipt
|
from snipts.models import Favorite, Snipt
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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 datetime
|
||||||
import hashlib
|
import hashlib
|
||||||
|
import parsedatetime as pdt
|
||||||
import re
|
import re
|
||||||
import time
|
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)
|
models.signals.post_save.connect(create_api_key, sender=User)
|
||||||
|
|
||||||
|
|
|
@ -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 datetime
|
||||||
import hashlib
|
import hashlib
|
||||||
import random
|
import random
|
||||||
import re
|
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):
|
class Snipt(models.Model):
|
||||||
"""An individual Snipt."""
|
"""An individual Snipt."""
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import datetime
|
import datetime
|
||||||
|
|
||||||
from haystack import indexes
|
from haystack import indexes
|
||||||
from snipts.models import Snipt
|
from snipts.models import Snipt
|
||||||
|
|
||||||
|
|
|
@ -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
|
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()
|
register = template.Library()
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from tastypie.test import ResourceTestCase
|
|
||||||
from tastypie.models import ApiKey
|
|
||||||
from snipts.models import Snipt
|
from snipts.models import Snipt
|
||||||
|
from tastypie.models import ApiKey
|
||||||
|
from tastypie.test import ResourceTestCase
|
||||||
|
|
||||||
|
|
||||||
class SniptResourceTest(ResourceTestCase):
|
class SniptResourceTest(ResourceTestCase):
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
from django.conf.urls import *
|
from django.conf.urls import *
|
||||||
|
|
||||||
from snipts import views
|
from snipts import views
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
|
import uuid
|
||||||
|
|
||||||
from django.contrib.auth import authenticate, login
|
from django.contrib.auth import authenticate, login
|
||||||
from django.template.defaultfilters import slugify
|
from django.template.defaultfilters import slugify
|
||||||
from registration.signals import user_registered
|
|
||||||
from pygments.lexers import get_all_lexers
|
from pygments.lexers import get_all_lexers
|
||||||
|
from registration.signals import user_registered
|
||||||
import uuid
|
|
||||||
|
|
||||||
|
|
||||||
def slugify_uniquely(value, model, slugfield="slug"):
|
def slugify_uniquely(value, model, slugfield="slug"):
|
||||||
|
|
|
@ -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 annoying.decorators import render_to
|
||||||
from snipts.models import Favorite, Snipt
|
from annoying.functions import get_object_or_None
|
||||||
from django.db.models import Count
|
|
||||||
from blogs.views import blog_list
|
from blogs.views import blog_list
|
||||||
from django.conf import settings
|
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 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.forms import ModelSearchForm
|
||||||
from haystack.query import EmptySearchQuerySet, SearchQuerySet
|
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)
|
RESULTS_PER_PAGE = getattr(settings, 'HAYSTACK_SEARCH_RESULTS_PER_PAGE', 20)
|
||||||
|
|
||||||
|
|
9
urls.py
9
urls.py
|
@ -1,7 +1,9 @@
|
||||||
|
import os
|
||||||
|
|
||||||
from django.conf.urls import include, patterns, url
|
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.contrib import admin
|
||||||
|
from django.http import HttpResponseRedirect
|
||||||
|
from django.views.generic import TemplateView
|
||||||
from snipts.api import (PublicSniptResource,
|
from snipts.api import (PublicSniptResource,
|
||||||
PublicUserResource, PrivateSniptResource,
|
PublicUserResource, PrivateSniptResource,
|
||||||
PrivateFavoriteResource, PrivateUserProfileResource,
|
PrivateFavoriteResource, PrivateUserProfileResource,
|
||||||
|
@ -12,9 +14,6 @@ from utils.views import SniptRegistrationView
|
||||||
from views import (homepage, lexers, login_redirect, pro, sitemap, tags,
|
from views import (homepage, lexers, login_redirect, pro, sitemap, tags,
|
||||||
pro_complete, user_api_key, for_teams, for_teams_complete)
|
pro_complete, user_api_key, for_teams, for_teams_complete)
|
||||||
|
|
||||||
import os
|
|
||||||
|
|
||||||
|
|
||||||
admin.autodiscover()
|
admin.autodiscover()
|
||||||
|
|
||||||
public_api = Api(api_name='public')
|
public_api = Api(api_name='public')
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
|
from django import forms
|
||||||
|
from django.contrib.auth.models import User
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from registration.forms import RegistrationForm
|
from registration.forms import RegistrationForm
|
||||||
from django.contrib.auth.models import User
|
|
||||||
from django import forms
|
|
||||||
|
|
||||||
|
|
||||||
class SniptRegistrationForm(RegistrationForm):
|
class SniptRegistrationForm(RegistrationForm):
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
from django.conf import settings
|
|
||||||
from django import template
|
|
||||||
|
|
||||||
import hmac
|
import hmac
|
||||||
import hashlib
|
import hashlib
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
from django import template
|
||||||
|
from django.conf import settings
|
||||||
|
|
||||||
register = template.Library()
|
register = template.Library()
|
||||||
|
|
||||||
|
|
||||||
|
|
30
views.py
30
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 datetime
|
||||||
import hashlib
|
import hashlib
|
||||||
import os
|
import os
|
||||||
import stripe
|
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')
|
@render_to('for-teams.html')
|
||||||
def for_teams(request):
|
def for_teams(request):
|
||||||
|
|
Loading…
Reference in New Issue