{% if snipt.lexer == 'markdown' %}
diff --git a/blogs/urls.py b/blogs/urls.py index 1c83ade..bfd0b63 100644 --- a/blogs/urls.py +++ b/blogs/urls.py @@ -1,3 +1,5 @@ -from django.conf.urls import * +from blogs import views +from django.conf.urls import url -urlpatterns = patterns('', url(r'^$', views.blog, name='blog')) + +urlpatterns = [url(r'^$', views.blog, name='blog')] diff --git a/blogs/views.py b/blogs/views.py index feec4db..922688e 100644 --- a/blogs/views.py +++ b/blogs/views.py @@ -1,7 +1,7 @@ import datetime from annoying.functions import get_object_or_None -from django.shortcuts import get_object_or_404, render_to_response +from django.shortcuts import get_object_or_404, render from django.template import RequestContext from snipts.models import Snipt @@ -58,10 +58,11 @@ def blog_list(request, username_or_custom_slug=None): template = '{}/list.html'.format(template) - return render_to_response( + return render( + request, template, context, - context_instance=RequestContext(request)) + ) def blog_post(request, username_or_custom_slug): @@ -115,13 +116,9 @@ def blog_post(request, username_or_custom_slug): template = '{}/post.html'.format(template) - return render_to_response(template, - context, - context_instance=RequestContext(request)) + return render(request, template, context) def rss(request, context): - return render_to_response('blogs/themes/default/rss.xml', - context, - context_instance=RequestContext(request), - content_type="application/rss+xml") + return render(request, 'blogs/themes/default/rss.xml', context, + content_type="application/rss+xml") diff --git a/requirements.txt b/requirements.txt index 3a71f15..8b9dffd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django==1.8.14 +Django==1.10.3 Fabric==1.10.2 PyYAML==3.11 Pygments==2.0.2 @@ -6,21 +6,21 @@ biplist==0.9 defusedxml==0.4.1 dj-database-url==0.3.0 dj-static==0.0.6 -django-annoying==0.8.3 +django-annoying==0.10.3 django-bcrypt==0.9.2 django-debug-toolbar==1.3.2 -django-extensions==1.5.7 +django-extensions==1.7.4 django-haystack==2.4.0 django-markdown-deux==1.0.5 -django-pagination-py3==1.1.0 -django-registration-redux==1.2 +django-pagination-py3==1.1.2 +django-registration-redux==1.4 django-storages==1.1.8 -django-taggit==0.16.2 -django-tastypie==0.12.2 -django-templatetag-sugar==1.0 +django-taggit==0.21.3 +django-tastypie==0.13.3 +-e git+ssh://git@github.com/nicksergeant/django-templatetag-sugar.git#egg=django-templatetag-sugar ecdsa==0.13 elasticsearch==1.6.0 -gunicorn==19.3.0 +gunicorn==19.6.0 lxml==3.4.4 markdown2==2.3.0 paramiko==1.15.2 @@ -37,5 +37,4 @@ six==1.9.0 smartypants==1.8.6 sqlparse==0.1.15 stripe==1.23.0 -typogrify==2.0.7 urllib3==1.11 diff --git a/settings.py b/settings.py index b524cac..8f0f6c8 100644 --- a/settings.py +++ b/settings.py @@ -79,8 +79,24 @@ STATIC_URL = '/static/' TASTYPIE_CANNED_ERROR = """There was an error with your request. The site developers have a record of this error, please email api@snipt.net and we'll help you out.""" -TEMPLATE_DIRS = (os.path.join(PROJECT_PATH, 'templates'),) -TEMPLATE_DEBUG = DEBUG + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [os.path.join(PROJECT_PATH, 'templates')], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.template.context_processors.static', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + TIME_ZONE = 'America/New_York' USE_HTTPS = True if 'USE_SSL' in os.environ else False USE_I18N = True @@ -111,7 +127,6 @@ INSTALLED_APPS = ( 'taggit', 'tastypie', 'teams', - 'typogrify', 'user-admin', 'utils', ) @@ -136,19 +151,6 @@ MIDDLEWARE_CLASSES = ( 'pagination.middleware.PaginationMiddleware', 'blogs.middleware.BlogMiddleware', ) -TEMPLATE_CONTEXT_PROCESSORS = ( - 'django.contrib.auth.context_processors.auth', - 'django.core.context_processors.debug', - 'django.core.context_processors.i18n', - 'django.core.context_processors.media', - 'django.core.context_processors.request', - 'django.core.context_processors.static', - 'django.contrib.messages.context_processors.messages', -) -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', -) try: from settings_local import * diff --git a/snipts/api.py b/snipts/api.py index de82a16..2762466 100644 --- a/snipts/api.py +++ b/snipts/api.py @@ -205,7 +205,7 @@ class PublicTagResource(ModelResource): max_limit = 200 cache = SimpleCache() - def build_filters(self, filters=None): + def build_filters(self, filters=None, **kwargs): if filters is None: filters = {} @@ -268,7 +268,7 @@ class PublicSniptResource(ModelResource): return bundle - def build_filters(self, filters=None): + def build_filters(self, filters=None, **kwargs): if filters is None: filters = {} @@ -478,7 +478,7 @@ class PrivateSniptResource(ModelResource): return bundle - def build_filters(self, filters=None): + def build_filters(self, filters=None, **kwargs): if filters is None: filters = {} diff --git a/snipts/urls.py b/snipts/urls.py index 77f648e..c9bdda7 100644 --- a/snipts/urls.py +++ b/snipts/urls.py @@ -1,50 +1,50 @@ -from django.conf.urls import * +from django.conf.urls import url from snipts import views -urlpatterns = \ - patterns('', - url(r'^s/(?P[^/]+)/(?P[^\?]+)?$', - views.redirect_snipt, name='redirect-snipt'), - url(r'^(?P[^/]+)/feed/$', - views.redirect_user_feed, - name='redirect-feed'), - url(r'^public/tag/(?P[^/]+)/feed/$', - views.redirect_public_tag_feed, - name='redirect-public-tag-feed'), - url(r'^(?P[^/]+)/tag/(?P[^/]+)/feed/$', - views.redirect_user_tag_feed, - name='redirect-user-tag-feed'), - url(r'^public/$', - views.list_public, - name='list-public'), - url(r'^public/tag/(?P[^/]+)/$', - views.list_public, - name='list-public-tag'), - url(r'^download/(?P[^/]+).*$', - views.download, - name='download'), - url(r'^embed/(?P[^/]+)/$', - views.embed, - name='embed'), - url(r'^raw/(?P[^/]+)/(?P[^\?]+)?$', - views.raw, - name='raw'), - url(r'^report-spam/(?P[^/]+)/$', - views.report_spam, - name='report-spam'), - url(r'^(?P[^/]+)/$', - views.list_user, - name='list-user'), - url(r'^(?P[^/]+)/tag/(?P[^/]+)/$', - views.list_user, - name='list-user-tag'), - url(r'^(?P[^/]+)/favorites/$', - views.favorites, - name='favorites'), - url(r'^(?P[^/]+)/blog-posts/$', - views.blog_posts, - name='blog-posts'), - url(r'^(?P[^/]+)/(?P[^/]+)/$', - views.detail, - name='detail')) +urlpatterns = [ + url(r'^s/(?P[^/]+)/(?P[^\?]+)?$', + views.redirect_snipt, name='redirect-snipt'), + url(r'^(?P[^/]+)/feed/$', + views.redirect_user_feed, + name='redirect-feed'), + url(r'^public/tag/(?P[^/]+)/feed/$', + views.redirect_public_tag_feed, + name='redirect-public-tag-feed'), + url(r'^(?P[^/]+)/tag/(?P[^/]+)/feed/$', + views.redirect_user_tag_feed, + name='redirect-user-tag-feed'), + url(r'^public/$', + views.list_public, + name='list-public'), + url(r'^public/tag/(?P[^/]+)/$', + views.list_public, + name='list-public-tag'), + url(r'^download/(?P[^/]+).*$', + views.download, + name='download'), + url(r'^embed/(?P[^/]+)/$', + views.embed, + name='embed'), + url(r'^raw/(?P[^/]+)/(?P[^\?]+)?$', + views.raw, + name='raw'), + url(r'^report-spam/(?P[^/]+)/$', + views.report_spam, + name='report-spam'), + url(r'^(?P[^/]+)/$', + views.list_user, + name='list-user'), + url(r'^(?P[^/]+)/tag/(?P[^/]+)/$', + views.list_user, + name='list-user-tag'), + url(r'^(?P[^/]+)/favorites/$', + views.favorites, + name='favorites'), + url(r'^(?P[^/]+)/blog-posts/$', + views.blog_posts, + name='blog-posts'), + url(r'^(?P[^/]+)/(?P[^/]+)/$', + views.detail, + name='detail') + ] diff --git a/snipts/views.py b/snipts/views.py index 80bfe26..6ce9d8c 100644 --- a/snipts/views.py +++ b/snipts/views.py @@ -8,7 +8,7 @@ from django.core.paginator import Paginator, InvalidPage from django.db.models import Count from django.db.models import Q from django.http import Http404, HttpResponse, HttpResponseRedirect, HttpResponseBadRequest -from django.shortcuts import get_object_or_404, render_to_response +from django.shortcuts import get_object_or_404, render from django.template import RequestContext from django.views.decorators.cache import never_cache from haystack.forms import ModelSearchForm @@ -80,10 +80,10 @@ def embed(request, snipt_key): snipt = get_object_or_404(Snipt, key=snipt_key) lines = snipt.embedded.split('\n') - return render_to_response('snipts/embed.html', - {'lines': lines, 'snipt': snipt}, - context_instance=RequestContext(request), - content_type='application/javascript') + return render(request, + 'snipts/embed.html', + {'lines': lines, 'snipt': snipt}, + content_type='application/javascript') def report_spam(request, snipt_id): @@ -297,17 +297,17 @@ def raw(request, snipt_key, lexer=None): if 'nice' in request.GET: content_type = 'text/html' - return render_to_response('snipts/raw.html', - {'snipt': snipt}, - context_instance=RequestContext(request), - content_type=content_type) + return render(request, + 'snipts/raw.html', + {'snipt': snipt}, + content_type=content_type) def rss(request, context): - return render_to_response('rss.xml', - context, - context_instance=RequestContext(request), - content_type="application/rss+xml") + return render(request, + 'rss.xml', + context, + content_type="application/rss+xml") @never_cache @@ -379,9 +379,7 @@ def search(request, template='search/search.html', load_all=True, if extra_context: context.update(extra_context) - return render_to_response(template, - context, - context_instance=context_class(request)) + return render(request, template, context) def redirect_snipt(request, snipt_key, lexer=None): diff --git a/teams/urls.py b/teams/urls.py index 2038bef..eccc9e5 100644 --- a/teams/urls.py +++ b/teams/urls.py @@ -1,17 +1,17 @@ -from django.conf.urls import * +from django.conf.urls import url from teams import views -urlpatterns = \ - patterns('', - url(r'^for-teams/$', views.for_teams), - url(r'^for-teams/complete/$', views.for_teams_complete), - url(r'^(?P[^/]+)/members/remove/(?P[^/]+)/$', - views.remove_team_member, - name='remove-team-member'), - url(r'^(?P[^/]+)/members/add/(?P[^/]+)/$', - views.add_team_member, - name='add-team-member'), - url(r'^(?P[^/]+)/members/$', - views.team_members, - name='team-members')) +urlpatterns = [ + url(r'^for-teams/$', views.for_teams), + url(r'^for-teams/complete/$', views.for_teams_complete), + url(r'^(?P[^/]+)/members/remove/(?P[^/]+)/$', + views.remove_team_member, + name='remove-team-member'), + url(r'^(?P[^/]+)/members/add/(?P[^/]+)/$', + views.add_team_member, + name='add-team-member'), + url(r'^(?P[^/]+)/members/$', + views.team_members, + name='team-members') + ] diff --git a/templates/__init__.py b/templates/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/templates/base.html b/templates/base.html index 46bbeea..987804a 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,4 +1,4 @@ -{% load snipt_tags %} +{% load snipt_tags static %} diff --git a/templates/homepage.html b/templates/homepage.html index fe97ff3..539b43f 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% load humanize %} +{% load humanize static %} {% block sub-header %}{% endblock %} {% block keyboard-shortcuts %}{% endblock %} diff --git a/templates/pagination/pagination.html b/templates/pagination/pagination.html index 7365edc..cbd7f43 100644 --- a/templates/pagination/pagination.html +++ b/templates/pagination/pagination.html @@ -1,5 +1,4 @@ {% if is_paginated %} -{% load i18n %}