From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl> Date: Thu, 18 Jul 2013 13:35:44 +0000 (+0200) Subject: Move to Django 1.5 X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/b2789efe30a42c1c9780c6cf132d905ea7e41c87 Move to Django 1.5 --- diff --git a/catalogue/templates/catalogue/lesson/appendix/lesson_detail.html b/catalogue/templates/catalogue/lesson/appendix/lesson_detail.html index fae3bcb..7dce3c9 100755 --- a/catalogue/templates/catalogue/lesson/appendix/lesson_detail.html +++ b/catalogue/templates/catalogue/lesson/appendix/lesson_detail.html @@ -1,5 +1,4 @@ {% extends "catalogue/lesson/lesson_detail.html" %} -{% load url from future %} {% block sidebar-top %} diff --git a/catalogue/templates/catalogue/lesson/course/lesson_detail.html b/catalogue/templates/catalogue/lesson/course/lesson_detail.html index ed246c2..cadc580 100755 --- a/catalogue/templates/catalogue/lesson/course/lesson_detail.html +++ b/catalogue/templates/catalogue/lesson/course/lesson_detail.html @@ -1,5 +1,4 @@ {% extends "catalogue/lesson/lesson_detail.html" %} -{% load url from future %} {% block sidebar-top %} diff --git a/catalogue/templates/catalogue/lesson/lesson_detail.html b/catalogue/templates/catalogue/lesson/lesson_detail.html index dfd844e..c6f726a 100755 --- a/catalogue/templates/catalogue/lesson/lesson_detail.html +++ b/catalogue/templates/catalogue/lesson/lesson_detail.html @@ -1,5 +1,4 @@ {% extends "base.html" %} -{% load url from future %} {% load lesson_link lesson_nav person_list from catalogue_tags %} {% load competence curriculum url_for_level from curriculum_tags %} diff --git a/catalogue/templates/catalogue/lesson/synthetic/lesson_detail.html b/catalogue/templates/catalogue/lesson/synthetic/lesson_detail.html index e9092d4..c7d04c8 100755 --- a/catalogue/templates/catalogue/lesson/synthetic/lesson_detail.html +++ b/catalogue/templates/catalogue/lesson/synthetic/lesson_detail.html @@ -1,5 +1,4 @@ {% extends "catalogue/lesson/lesson_detail.html" %} -{% load url from future %} {% block sidebar-top %} diff --git a/catalogue/templates/catalogue/snippets/carousel.html b/catalogue/templates/catalogue/snippets/carousel.html index 2adc9e2..c482556 100755 --- a/catalogue/templates/catalogue/snippets/carousel.html +++ b/catalogue/templates/catalogue/snippets/carousel.html @@ -1,4 +1,3 @@ -{% load url from future %} {% load static %} {% url "info" "jak-korzystac/" as jak %} diff --git a/catalogue/templates/catalogue/snippets/lesson_nav.html b/catalogue/templates/catalogue/snippets/lesson_nav.html index 776c79f..fa9d8ad 100755 --- a/catalogue/templates/catalogue/snippets/lesson_nav.html +++ b/catalogue/templates/catalogue/snippets/lesson_nav.html @@ -1,4 +1,3 @@ -{% load url from future %} <h1> {% if root %} <a href="{{ root.get_absolute_url }}">{{ root }}</a> diff --git a/catalogue/templates/catalogue/snippets/section_buttons.html b/catalogue/templates/catalogue/snippets/section_buttons.html index d926dbe..c7bb162 100755 --- a/catalogue/templates/catalogue/snippets/section_buttons.html +++ b/catalogue/templates/catalogue/snippets/section_buttons.html @@ -1,5 +1,3 @@ -{% load url from future %} - <ul class="section-buttons"> {% for object in object_list %} {% url "catalogue_lessons" as lessons_url %} diff --git a/contact/admin.py b/contact/admin.py index 3776fc4..ee1623d 100644 --- a/contact/admin.py +++ b/contact/admin.py @@ -7,7 +7,7 @@ from django.template import Template from django.utils.safestring import mark_safe -class ContactAdminMeta(admin.ModelAdmin.__metaclass__): +class ContactAdminMeta(admin.ModelAdmin.__class__): def __getattr__(cls, name): if name.startswith('admin_list_'): return lambda self: "" diff --git a/contact/forms.py b/contact/forms.py index 8e78eed..0279e12 100644 --- a/contact/forms.py +++ b/contact/forms.py @@ -10,7 +10,7 @@ from django.utils.translation import ugettext_lazy as _ contact_forms = {} admin_list_width = 0 -class ContactFormMeta(forms.Form.__metaclass__): +class ContactFormMeta(forms.Form.__class__): def __new__(cls, *args, **kwargs): global admin_list_width model = super(ContactFormMeta, cls).__new__(cls, *args, **kwargs) diff --git a/contact/templates/contact/mail_managers_body.txt b/contact/templates/contact/mail_managers_body.txt index 386c9cd..f9f3995 100644 --- a/contact/templates/contact/mail_managers_body.txt +++ b/contact/templates/contact/mail_managers_body.txt @@ -1,4 +1,4 @@ -{% load url from future %}WypeÅniono formularz {{ form_tag }} na stronie {{ site_name }}. +WypeÅniono formularz {{ form_tag }} na stronie {{ site_name }}. http://{{ site_domain }}{% url 'admin:contact_contact_change' contact.pk %} diff --git a/contact/urls.py b/contact/urls.py index de72e82..7f8d4c4 100644 --- a/contact/urls.py +++ b/contact/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import patterns, url from . import views urlpatterns = patterns('contact.views', diff --git a/curriculum/templates/curriculum/snippets/course_boxes_toc.html b/curriculum/templates/curriculum/snippets/course_boxes_toc.html index cb52cdc..db6d484 100755 --- a/curriculum/templates/curriculum/snippets/course_boxes_toc.html +++ b/curriculum/templates/curriculum/snippets/course_boxes_toc.html @@ -1,5 +1,3 @@ -{% load url from future %} - {% url "catalogue_lessons" as lessons_url %} {% for course in object_list %} <li><a href="{{ lessons_url }}#{{ course.slug }}"> diff --git a/edumed/templates/base.html b/edumed/templates/base.html index 83f7e0d..6233cf3 100644 --- a/edumed/templates/base.html +++ b/edumed/templates/base.html @@ -1,5 +1,4 @@ <!DOCTYPE html> -{% load url from future %} {% load i18n static %} {% load fnp_common fnp_share fnp_lang macros %} {% load compressed static %} diff --git a/edumed/templates/home.html b/edumed/templates/home.html index 2cfd7b0..49907fe 100755 --- a/edumed/templates/home.html +++ b/edumed/templates/home.html @@ -1,5 +1,4 @@ {% extends "base.html" %} -{% load url from future %} {% load catalogue_tags %} {% load course_boxes_toc from curriculum_tags %} {% load chunk from chunks %} diff --git a/requirements.txt b/requirements.txt index b26724b..41857b0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ -i http://pypi.nowoczesnapolska.org.pl/simple -Django>=1.4,<1.5 +Django>=1.5,<1.6 South>=0.7.4 django-pipeline>=1.2,<1.3 python-memcached @@ -24,7 +24,7 @@ texml # sponsors pillow -django-sponsors +django-sponsors>=1.1,<1.2 --e git+https://github.com/toastdriven/django-haystack.git@61b377d97efd5390c60c5a37acd009b8e69eb2f3#egg=django-haystack -pysolr>=2,<3 +django-haystack>=2.0,<2.1 +pysolr>=3,<4