From 3bb77aad08a5558125b1cc80a599135d0e68eeda Mon Sep 17 00:00:00 2001
From: Radek Czajka <radekczajka@nowoczesnapolska.org.pl>
Date: Thu, 1 Aug 2013 11:48:37 +0200
Subject: [PATCH] Django 1.5

---
 apps/archive/templates/archive/base.html       | 18 +++++++++---------
 .../templates/archive/file_managed.html        | 14 +++++++-------
 apps/archive/templates/archive/file_new.html   |  2 +-
 .../templates/archive/file_unmanaged.html      |  2 +-
 apps/archive/templates/archive/list_new.html   |  2 +-
 .../templates/archive/list_published.html      |  2 +-
 .../templates/archive/list_publishing.html     |  2 +-
 .../templates/archive/list_unmanaged.html      |  2 +-
 .../templates/archive/list_unpublished.html    |  2 +-
 apps/archive/urls.py                           |  5 +++--
 audiobooks/settings.py                         |  6 ++++++
 audiobooks/urls.py                             |  5 +++--
 requirements.txt                               |  6 ++++--
 13 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/apps/archive/templates/archive/base.html b/apps/archive/templates/archive/base.html
index 575cf8e..8ec34e9 100644
--- a/apps/archive/templates/archive/base.html
+++ b/apps/archive/templates/archive/base.html
@@ -2,21 +2,21 @@
 {% load i18n %}
 
 {% block repo-zones-nav %}
-    <a {% if division = "new" %}class="active" {% endif %}href="{% url list_new %}">{% trans "New" %}</a>
-    <a {% if division = "unpublished" %}class="active" {% endif %}href="{% url list_unpublished %}">{% trans "Unpublished" %}</a>
-    <a {% if division = "publishing" %}class="active" {% endif %}href="{% url list_publishing %}">{% trans "Publishing" %}</a>
-    <a {% if division = "published" %}class="active" {% endif %}href="{% url list_published %}">{% trans "Published" %}</a>
-    <a {% if division = "unmanaged" %}class="active" {% endif %}href="{% url list_unmanaged %}">{% trans "Archive" %}</a>
+    <a {% if division = "new" %}class="active" {% endif %}href="{% url 'list_new' %}">{% trans "New" %}</a>
+    <a {% if division = "unpublished" %}class="active" {% endif %}href="{% url 'list_unpublished' %}">{% trans "Unpublished" %}</a>
+    <a {% if division = "publishing" %}class="active" {% endif %}href="{% url 'list_publishing' %}">{% trans "Publishing" %}</a>
+    <a {% if division = "published" %}class="active" {% endif %}href="{% url 'list_published' %}">{% trans "Published" %}</a>
+    <a {% if division = "unmanaged" %}class="active" {% endif %}href="{% url 'list_unmanaged' %}">{% trans "Archive" %}</a>
     {% if user.is_staff %}
-        <a href='{% url admin:archive_project_changelist %}'>{% trans "Projects" %}</a>
+        <a href='{% url "admin:archive_project_changelist" %}'>{% trans "Projects" %}</a>
     {% endif %}
     {% if user.is_authenticated %}
-        <a href="{% url logout %}" style='float: right;'>{% trans "Logout" %}</a>
+        <a href="{% url 'logout' %}" style='float: right;'>{% trans "Logout" %}</a>
     {% else %}
-        <a href="{% url login %}" style='float: right;'>{% trans "Login" %}</a>
+        <a href="{% url 'login' %}" style='float: right;'>{% trans "Login" %}</a>
     {% endif %}
     {% if user.is_staff %}
-        <a href='{% url admin:index %}' style='float: right;'>{% trans "Administration" %}</a>
+        <a href='{% url "admin:index" %}' style='float: right;'>{% trans "Administration" %}</a>
     {% endif %}
     {% if user.is_authenticated %}
         <span style='float: right;'>{{ user }}</span>
diff --git a/apps/archive/templates/archive/file_managed.html b/apps/archive/templates/archive/file_managed.html
index 58f45ef..8917243 100755
--- a/apps/archive/templates/archive/file_managed.html
+++ b/apps/archive/templates/archive/file_managed.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 
-<p>Plik źródłowy: <a href='{% url download audiobook.id %}'>{{ path }}</a>
+<p>Plik źródłowy: <a href='{% url "download" audiobook.id %}'>{{ path }}</a>
 (sha1: <tt>{{ audiobook.source_sha1 }}</tt>).
 </p>
 
@@ -14,7 +14,7 @@
 
 <h2>{% trans "Publishing pending" %}</h2>
 
-<form method="post" action="{% url cancel_publishing audiobook.id %}">
+<form method="post" action="{% url 'cancel_publishing' audiobook.id %}">
     {% csrf_token %}
     <input type="submit" value="{% trans "Cancel publishing" %}" />
 </form>
@@ -46,13 +46,13 @@
         {% tags_table audiobook.new_publish_tags 0 %}
         <tr><th></th><td>
 
-            <form method="post" action="{% url publish audiobook.id %}">
+            <form method="post" action="{% url 'publish' audiobook.id %}">
                 {% csrf_token %}
                 <input type="submit" value="{% trans "Publish" %}" />
             </form>
 
             {% if not audiobook.mp3_published or not audiobook.ogg_published %}
-            <form method="post" action="{% url convert audiobook.id %}">
+            <form method="post" action="{% url 'convert' audiobook.id %}">
                 {% csrf_token %}
                 <input type="submit" value="{% trans "Convert without publishing" %}" />
             </form>
@@ -65,7 +65,7 @@
 <hr/>
 {% if audiobook.mp3_file %}
     <h2>{% trans "MP3 file" %}</h2>
-    <p><a href="{% url download audiobook.id 'mp3' %}">{% trans "Download MP3 file." %}</a></p>
+    <p><a href="{% url 'download' audiobook.id 'mp3' %}">{% trans "Download MP3 file." %}</a></p>
     {% if audiobook.mp3_published %}
         <p>{% trans "Published:" %} {{ audiobook.mp3_published }}</a></p>
         {% if audiobook.mp3_published_tags.tags %}
@@ -81,7 +81,7 @@
 <hr/>
 {% if audiobook.ogg_file %}
     <h2>{% trans "Ogg Vorbis file" %}</h2>
-    <p><a href="{% url download audiobook.id 'ogg' %}">{% trans "Download Ogg Vorbis file." %}</a></p>
+    <p><a href="{% url 'download' audiobook.id 'ogg' %}">{% trans "Download Ogg Vorbis file." %}</a></p>
     {% if audiobook.ogg_published %}
         <p>{% trans "Published:" %} {{ audiobook.ogg_published }}</a></p>
         {% if audiobook.ogg_published_tags.tags %}
@@ -124,7 +124,7 @@ Last modified: {{ audiobook.modified }}
 
 
 
-<form method="post" action="{% url remove_to_archive audiobook.id %}"
+<form method="post" action="{% url 'remove_to_archive' audiobook.id %}"
     onsubmit='return confirm("{% trans "Are you sure you want to move this audiobook to archive?" %}")'>
     {% csrf_token %}
     <input type="submit" value="{% trans "Remove to archive" %}" />
diff --git a/apps/archive/templates/archive/file_new.html b/apps/archive/templates/archive/file_new.html
index 466c576..acc161d 100644
--- a/apps/archive/templates/archive/file_new.html
+++ b/apps/archive/templates/archive/file_new.html
@@ -3,7 +3,7 @@
 
 {% block content %}
 
-<form method="post" action="{% url move_to_archive filename %}">
+<form method="post" action="{% url 'move_to_archive' filename %}">
     {% csrf_token %}
     <input type="submit" value="{% trans "Move to archive" %}" />
 </form>
diff --git a/apps/archive/templates/archive/file_unmanaged.html b/apps/archive/templates/archive/file_unmanaged.html
index addd28e..89f79ba 100755
--- a/apps/archive/templates/archive/file_unmanaged.html
+++ b/apps/archive/templates/archive/file_unmanaged.html
@@ -23,7 +23,7 @@
 </ul>
 
 
-<form method="post" action="{% url move_to_new filename %}">
+<form method="post" action="{% url 'move_to_new' filename %}">
     {% csrf_token %}
     <input type="submit" value="{% trans "Move to new files" %}" />
 </form>
diff --git a/apps/archive/templates/archive/list_new.html b/apps/archive/templates/archive/list_new.html
index 459593b..fabf446 100644
--- a/apps/archive/templates/archive/list_new.html
+++ b/apps/archive/templates/archive/list_new.html
@@ -16,7 +16,7 @@
 {% block file-list %}
     {% for file in objects %}
         <li>
-            <a href='{% url file_new file|urlencode %}'>{{ file }}</a>
+            <a href='{% url "file_new" file|urlencode %}'>{{ file }}</a>
         </li>
     {% endfor %}
 {% endblock %}
diff --git a/apps/archive/templates/archive/list_published.html b/apps/archive/templates/archive/list_published.html
index 6bbec9b..5e61ba1 100755
--- a/apps/archive/templates/archive/list_published.html
+++ b/apps/archive/templates/archive/list_published.html
@@ -14,7 +14,7 @@
 {% block file-list %}
     {% for file in objects %}
         <li>
-            <a href='{% url file file.id %}'>{{ file }}</a>
+            <a href='{% url "file" file.id %}'>{{ file }}</a>
         </li>
     {% endfor %}
 {% endblock %}
diff --git a/apps/archive/templates/archive/list_publishing.html b/apps/archive/templates/archive/list_publishing.html
index 501b94c..6bcf9e0 100755
--- a/apps/archive/templates/archive/list_publishing.html
+++ b/apps/archive/templates/archive/list_publishing.html
@@ -14,7 +14,7 @@
         <ul>
             {% for file in objects %}
             <li>
-                <a href='{% url file file.id %}'>{{ file }}</a>
+                <a href='{% url "file" file.id %}'>{{ file }}</a>
                 ({% if file.mp3_status = k.0 %}MP3{% if file.ogg_status = k.0 %}, {% endif %}{% endif %}{% if file.ogg_status = k.0 %}Ogg{% endif %})
             </li>
             {% endfor %}
diff --git a/apps/archive/templates/archive/list_unmanaged.html b/apps/archive/templates/archive/list_unmanaged.html
index 6b7486b..fd48c33 100755
--- a/apps/archive/templates/archive/list_unmanaged.html
+++ b/apps/archive/templates/archive/list_unmanaged.html
@@ -13,7 +13,7 @@
 {% block file-list %}
     {% for file in objects %}
         <li>
-            <a href='{% url file_unmanaged file|urlencode %}'>{{ file }}</a>
+            <a href='{% url "file_unmanaged" file|urlencode %}'>{{ file }}</a>
         </li>
     {% endfor %}
 {% endblock %}
diff --git a/apps/archive/templates/archive/list_unpublished.html b/apps/archive/templates/archive/list_unpublished.html
index d414b1d..b901ef0 100755
--- a/apps/archive/templates/archive/list_unpublished.html
+++ b/apps/archive/templates/archive/list_unpublished.html
@@ -14,7 +14,7 @@
 {% block file-list %}
     {% for file in objects %}
         <li>
-            <a href='{% url file file.id %}'>{{ file }}</a>
+            <a href='{% url "file" file.id %}'>{{ file }}</a>
 
             {% if file.mp3_published %}
                 <span class="list-published-tag" title="{{ file.mp3_published }}">MP3</span>
diff --git a/apps/archive/urls.py b/apps/archive/urls.py
index a67bd43..efaeeea 100644
--- a/apps/archive/urls.py
+++ b/apps/archive/urls.py
@@ -1,7 +1,8 @@
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, include, url
+from django.views.generic import RedirectView
 
 urlpatterns = patterns('',
-    url(r'^$', 'django.views.generic.simple.redirect_to', {'url': 'new/'}),
+    url(r'^$', RedirectView.as_view(url='new/')),
 
     url(r'^new/$', 'archive.views.list_new', name="list_new"),
     url(r'^new/(.+)/$', 'archive.views.file_new', name="file_new"),
diff --git a/audiobooks/settings.py b/audiobooks/settings.py
index 9289581..3f92da0 100644
--- a/audiobooks/settings.py
+++ b/audiobooks/settings.py
@@ -149,9 +149,15 @@ INSTALLED_APPS = (
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,
+    'filters': {
+         'require_debug_false': {
+             '()': 'django.utils.log.RequireDebugFalse'
+         }
+     },
     'handlers': {
         'mail_admins': {
             'level': 'ERROR',
+            'filters': ['require_debug_false'],
             'class': 'django.utils.log.AdminEmailHandler'
         }
     },
diff --git a/audiobooks/urls.py b/audiobooks/urls.py
index 9ad2de4..f3113c8 100644
--- a/audiobooks/urls.py
+++ b/audiobooks/urls.py
@@ -1,12 +1,13 @@
 from django.conf import settings
-from django.conf.urls.defaults import patterns, include, url
+from django.conf.urls import patterns, include, url
+from django.views.generic import RedirectView
 
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
 admin.autodiscover()
 
 urlpatterns = patterns('',
-    url(r'^$', 'django.views.generic.simple.redirect_to', {'url': 'archive/'}),
+    url(r'^$', RedirectView.as_view(url='archive/')),
     url(r'^archive/', include('archive.urls')),
 
     url(r'^admin/', include(admin.site.urls)),
diff --git a/requirements.txt b/requirements.txt
index 66a8fd8..98fcda9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,9 @@
-django>=1.3,<1.4
+-i http://pypi.nowoczesnapolska.org.pl/simple
+
+django>=1.5,<1.6
 django-jsonfield
 South>=0.7
-django-cas
+django-cas=2.1.1.1
 
 django-celery
 django-kombu
-- 
2.20.1