Merge lp:~lukasz-czyzykowski/ubuntu-webcatalog/upgrade-to-django-1.5 into lp:ubuntu-webcatalog

[Łukasz Czyżykowski]

Upgrade to Django 1.5.1

Upgrade to Django 1.5.1

[Michael Nelson (michael.nelson)]

12:54 <noodles> Hey there. Just looking at https://code.launchpad.net/~lukasz-czyzykowski/ubuntu-webcatalog/upgrade-to-django-1.5/+merge/158009
12:54 <noodles> Did you have that same piston surgery in the sca branch? I think I saw it and had a thought, but forgot to comment...
12:55 <noodles> Why wouldn't we fix that it piston instead? (I mean, update piston to use json rather than simplejson). Rather than doing patch-work on all of our apps?
12:58 <lukasz> noodles: I did that for all apps
12:58 <lukasz> noodles: patching seemed a quicker way to the end result than fixing piston
12:58 <lukasz> noodles: but I would really like to fix that dead project
13:01 <noodles> Yeah, it sounds quicker initially, but looks like more work in the long run.
13:01 <noodles> Also, what's the private attribute setting for 'HttpResponse._is_string = True' around line 152-54
13:02 <lukasz> another piston backward compatibility
13:03 <noodles> Hrm... do you mean, we could include the fix in an updated piston also?
13:03 <lukasz> it expects this attribute on the response object, and we never return response with iterator content, so that's why it's hardcoded
13:03 <lukasz> noodles: yup
13:03 <noodles> Do you want me to update piston?
13:04 <lukasz> noodles: I can do it, patches for all of the problems are on bitbucket
13:04 <noodles> Ah, sweet.
13:04 <noodles> Ah of course...
13:04 <lukasz> where do we store patched version?
13:04 <noodles> I was thinking we were talking about piston-mini-client (which is easy for us to update)....
13:04 <lukasz> no, that's django-piston
13:04 <noodles> Yeah,
13:05 <lukasz> which needs to be fixed
13:05 <lukasz> https://bitbucket.org/jespern/django-piston/pull-requests
13:05 <noodles> In which case, +1 for your work-arounds, just include a comment on that previous one.
13:05 <noodles> l152-154
13:05 <lukasz> HttpResponse?
13:05 <lukasz> ok

review: Approve

[lp:~lukasz-czyzykowski/ubuntu-webcatalog/upgrade-to-django-1.5]

199. By Łukasz Czyżykowski on 2013-04-15

Added comment about _is_string attribute on http responses in the api module.

=== modified file 'django_project/config/main.cfg'
--- django_project/config/main.cfg	2013-02-28 16:23:58 +0000
+++ django_project/config/main.cfg	2013-04-15 13:23:28 +0000
@@ -37,6 +37,9 @@
                      webcatalog.middleware.exception.LogExceptionMiddleware
                      django.middleware.cache.FetchFromCacheMiddleware
 fixture_dirs =
+template_loaders = django.template.loaders.filesystem.Loader
+                   django.template.loaders.app_directories.Loader
+                   django.template.loaders.eggs.Loader
 
 secret_key = eepu9Av5ixage9ahhodovahfaiFoorodahf6keip3eichaeW9f
 template_debug = %(debug)s
@@ -58,15 +61,11 @@
 admin_media_prefix = /assets/admin/
 test_runner = djcelery.contrib.test_runner.CeleryTestSuiteRunner
 
-# Django-1.1 backwards compatibility
-database_engine = sqlite3
-database_name = webcatalog.db
-
 [django_databases]
 default = default_database
 
 [default_database]
-engine = sqlite3
+engine = django.db.backends.sqlite3
 name = webcatalog.db
 
 [django_logging]

=== modified file 'django_project/urls.py'
--- django_project/urls.py	2013-02-28 16:23:58 +0000
+++ django_project/urls.py	2013-04-15 13:23:28 +0000
@@ -16,11 +16,12 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import preflight
-from django.conf.urls.defaults import patterns, include, url
+
+from django.conf.urls import patterns, include, url
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.auth.views import logout
-from django.views.generic.simple import redirect_to
+from django.views.generic import RedirectView
 
 admin.autodiscover()
 preflight.autodiscover()
@@ -33,7 +34,7 @@
     url(r'^cat/', include('webcatalog.urls')),
     url(r'^admin/', include(admin.site.urls)),
     (r'^preflight/$', include('preflight.urls')),
-    url(r'^$', redirect_to, {'url': '/cat/'}),
+    url(r'^$', RedirectView.as_view(url='/cat/')),
 
     # OpenID views
     (r'^openid/', include('django_openid_auth.urls')),

=== modified file 'fabtasks/django.py'
--- fabtasks/django.py	2011-09-12 13:37:24 +0000
+++ fabtasks/django.py	2013-04-15 13:23:28 +0000
@@ -23,6 +23,7 @@
 from ConfigParser import ConfigParser
 from xml.etree import ElementTree as et
 
+
 def manage(command, *args):
     """Run manage.py command"""
     local("virtualenv/bin/python django_project/manage.py {0} {1}".format(
@@ -34,15 +35,10 @@
         spec = "webcatalog"
     if pg:
         local("virtualenv/bin/pip install psycopg2==2.4.1")
-        conf = {
-            'database_name': "uwc",
-            'database_engine': "postgresql_psycopg2",
-            'database_user': "postgres",
-        }
         conf_db = {
-            'engine': "postgresql_psycopg2",
+            'engine': "django.db.backends.postgresql_psycopg2",
             'name': "uwc",
-            'database_user': "postgres"
+            'user': "postgres"
         }
         conf_file = "django_project/local.cfg"
         parser = ConfigParser()
@@ -51,8 +47,6 @@
             parser.read([conf_file])
         if not parser.has_section('django'):
             parser.add_section('django')
-        for name, value in conf.items():
-            parser.set('django', name, value)
         if not parser.has_section('default_database'):
             parser.add_section('default_database')
         for name, value in conf_db.items():

=== modified file 'setup.py'
--- setup.py	2013-02-28 16:23:58 +0000
+++ setup.py	2013-04-15 13:23:28 +0000
@@ -1,6 +1,7 @@
 import os
 from setuptools import setup, find_packages
 
+
 def find_packages_data(start_dir):
     packages = {}
     for package_name in os.listdir(start_dir):
@@ -35,9 +36,9 @@
     install_requires = [
         'django',
         'setuptools',
-        'south==0.7.3',
+        'south==0.7.6',
         'configglue==1.0.1',
-        'django-configglue==0.6.1',
+        'django-configglue==0.7',
         'django-openid-auth==0.2',
         'django-piston==0.2.3',
         'django-preflight',

=== modified file 'src/webcatalog/api/__init__.py'
--- src/webcatalog/api/__init__.py	2011-09-12 13:37:24 +0000
+++ src/webcatalog/api/__init__.py	2013-04-15 13:23:28 +0000
@@ -13,3 +13,17 @@
 #
 #   You should have received a copy of the GNU Affero General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Bit of surgery on pison internals, this fixes
+# https://github.com/simplejson/simplejson/issues/37
+
+import json
+import simplejson
+
+from piston.utils import Mimer
+from piston import emitters
+
+emitters.simplejson = json
+
+Mimer.unregister(simplejson.loads)
+Mimer.register(json.loads, ('application/json',))

=== modified file 'src/webcatalog/api/handlers.py'
--- src/webcatalog/api/handlers.py	2012-09-17 15:55:15 +0000
+++ src/webcatalog/api/handlers.py	2013-04-15 13:23:28 +0000
@@ -41,6 +41,13 @@
 )
 from .forms import MachineCreateUpdateForm, MachineUpdatePackagesForm
 
+# django-piston (outdated bit of software) expects those attributes to
+# determine if the resonse content is iterator or not. Here we never
+# use that possibliblit, so hardcoding the attribute.
+HttpResponse._is_string = True
+HttpResponseNotFound._is_string = True
+HttpResponseBadRequest._is_string = True
+
 
 class ServerStatusHandler(BaseHandler):
     allowed_methods = ('GET',)

=== modified file 'src/webcatalog/auth.py'
--- src/webcatalog/auth.py	2012-06-30 00:09:12 +0000
+++ src/webcatalog/auth.py	2013-04-15 13:23:28 +0000
@@ -24,6 +24,7 @@
 __all__ = [
     'SSOOAuthAuthentication',
 ]
+import pytz
 
 from datetime import datetime, timedelta
 from django.conf import settings
@@ -100,7 +101,8 @@
         tokens = Token.objects.filter(token=oauthtoken,
                                       consumer__key=consumer_key)
         if (len(tokens) == 0 or
-                tokens[0].updated_at < datetime.now() - TOKEN_CACHE_EXPIRY):
+                tokens[0].updated_at < (
+                datetime.now(pytz.utc) - TOKEN_CACHE_EXPIRY)):
             pieces = web_services.get_data_for_account(
                 token=oauthtoken, openid_identifier=consumer_key,
                 signature=request.get_parameter('oauth_signature'))

=== modified file 'src/webcatalog/management/commands/cleanup.py'
--- src/webcatalog/management/commands/cleanup.py	2012-09-11 14:19:39 +0000
+++ src/webcatalog/management/commands/cleanup.py	2013-04-15 13:23:28 +0000
@@ -27,6 +27,7 @@
 
 try:
     import psycopg2
+    psycopg2
     psycopg2_available = True
 except ImportError:
     psycopg2_available = False
@@ -165,6 +166,8 @@
                 batch_size -= batch_size_wobble
             elif actual_batch_time < target_batch_time * 0.9:
                 batch_size += batch_size_wobble
+            if batch_size < 1:
+                batch_size = 1
 
     def output(self, message, level=None, flush=False):
         if hasattr(self, 'stdout'):

=== modified file 'src/webcatalog/management/commands/import_ratings_stats.py'
--- src/webcatalog/management/commands/import_ratings_stats.py	2012-12-03 16:25:55 +0000
+++ src/webcatalog/management/commands/import_ratings_stats.py	2013-04-15 13:23:28 +0000
@@ -18,6 +18,8 @@
 """Management command to import review statistics for a distroseries."""
 
 import json
+import pytz
+
 from datetime import (
     datetime,
     timedelta,
@@ -87,7 +89,7 @@
     def update_last_import_timestamp(self, distroseries):
         review_stats_import, created = ReviewStatsImport.objects.get_or_create(
             distroseries=distroseries)
-        review_stats_import.last_import = datetime.utcnow()
+        review_stats_import.last_import = datetime.now(pytz.utc)
         review_stats_import.save()
 
     def download_review_stats(self, distroseries):
@@ -99,7 +101,7 @@
             if other_imports:
                 stats_import = other_imports[0]
                 time_since_last_import = (
-                    datetime.utcnow() - stats_import.last_import)
+                    datetime.now(pytz.utc) - stats_import.last_import)
                 if time_since_last_import < timedelta(days=1):
                     num_days = 1
                 elif time_since_last_import < timedelta(days=3):

=== modified file 'src/webcatalog/migrations/0015_add_applicationmedia.py'
--- src/webcatalog/migrations/0015_add_applicationmedia.py	2012-03-19 08:18:57 +0000
+++ src/webcatalog/migrations/0015_add_applicationmedia.py	2013-04-15 13:23:28 +0000
@@ -16,7 +16,7 @@
              self.gf('django.db.models.fields.CharField')(max_length=16)),
             ('url',
              self.gf('django.db.models.fields.URLField')(
-                 max_length=200, verify_exists=False)),
+                 max_length=200)),
         ))
         db.send_create_signal('webcatalog', ['ApplicationMedia'])
 
@@ -66,7 +66,7 @@
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'media_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}),
             'url': ('django.db.models.fields.URLField', [],
-                    {'max_length': '200', 'verify_exists': 'False'})
+                    {'max_length': '200'})
         },
         'webcatalog.application': {
             'Meta': {'unique_together': "(('distroseries', 'archive_id'),)", 'object_name': 'Application'},

=== modified file 'src/webcatalog/migrations/0016_populate_application_media.py'
--- src/webcatalog/migrations/0016_populate_application_media.py	2012-03-19 08:18:57 +0000
+++ src/webcatalog/migrations/0016_populate_application_media.py	2013-04-15 13:23:28 +0000
@@ -94,7 +94,7 @@
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'media_type': ('django.db.models.fields.CharField', [], {'max_length': '16'}),
             'url': ('django.db.models.fields.URLField', [],
-                    {'max_length': '200', 'verify_exists': 'False'})
+                    {'max_length': '200'})
         },
         'webcatalog.consumer': {
             'Meta': {'object_name': 'Consumer'},

=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2012-09-06 14:07:55 +0000
+++ src/webcatalog/models/applications.py	2013-04-15 13:23:28 +0000
@@ -226,7 +226,7 @@
 
     application = models.ForeignKey(Application)
     media_type = models.CharField(max_length=16, choices=MEDIA_CHOICES)
-    url = models.URLField(verify_exists=False)
+    url = models.URLField()
 
     def __unicode__(self):
         return "{0} for {1}".format(self.media_type, self.application)
@@ -286,7 +286,7 @@
     sca_id = models.IntegerField()
     package_names = models.CharField(max_length=1024)
     banner_url = models.CharField(max_length=1024)
-    click_url = models.URLField(verify_exists=False, default='')
+    click_url = models.URLField(default='')
     distroseries = models.ManyToManyField(DistroSeries)
     html = models.TextField()
     date_created = models.DateTimeField(auto_now_add=True)

=== modified file 'src/webcatalog/schema.py'
--- src/webcatalog/schema.py	2013-02-28 16:23:58 +0000
+++ src/webcatalog/schema.py	2013-04-15 13:23:28 +0000
@@ -17,13 +17,11 @@
 
 """configglue schema for the Apps Directory."""
 
-
-import django
 from configglue import schema
 from django_configglue.schema import schemas
 from oops_dictconfig.configglue_options import OopsOption
 
-DjangoSchema = schemas.get('1.3.1')
+DjangoSchema = schemas.get('1.5.1')
 
 
 class WebCatalogSchema(DjangoSchema):

=== modified file 'src/webcatalog/templates/404.html'
--- src/webcatalog/templates/404.html	2012-03-19 15:17:36 +0000
+++ src/webcatalog/templates/404.html	2013-04-15 13:23:28 +0000
@@ -11,7 +11,7 @@
 {% block header %}{% endblock %}
 
 {% block head_extra %}
-    <link rel="stylesheet" type="text/css" href="{% url wc-combo %}?light/css/reset.css&light/css/styles.css&light/css/404.css&light/css/forms.css"/>
+    <link rel="stylesheet" type="text/css" href="{% url 'wc-combo' %}?light/css/reset.css&light/css/styles.css&light/css/404.css&light/css/forms.css"/>
 {% endblock %}
 
 {% block content_container %}

=== modified file 'src/webcatalog/templates/light/index.1col.html'
--- src/webcatalog/templates/light/index.1col.html	2012-06-09 02:15:00 +0000
+++ src/webcatalog/templates/light/index.1col.html	2013-04-15 13:23:28 +0000
@@ -6,7 +6,7 @@
         <link rel="shortcut icon" href="{{ STATIC_URL }}images/favicon.ico" type="image/x-icon" />
         <link rel="stylesheet" type="text/css" media="all" href="https://fonts.googleapis.com/css?family=Ubuntu:300,300italic,400,400italic" />
         {% block head_extra %}
-        <link rel="stylesheet" type="text/css" href="{% url wc-combo %}?light/css/reset.css&light/css/styles.css&light/css/forms.css"/>
+        <link rel="stylesheet" type="text/css" href="{% url 'wc-combo' %}?light/css/reset.css&light/css/styles.css&light/css/forms.css"/>
         {% endblock %}
     </head>
     <body {% block body_extra %}{% endblock %}>

=== modified file 'src/webcatalog/templates/webcatalog/app_carousel_widget.html'
--- src/webcatalog/templates/webcatalog/app_carousel_widget.html	2012-04-19 09:49:41 +0000
+++ src/webcatalog/templates/webcatalog/app_carousel_widget.html	2013-04-15 13:23:28 +0000
@@ -14,8 +14,8 @@
                 <table class="apps"><tr>
             {% for app in apps %}
                 <td{% if forloop.counter|divisibleby:3 %} class="lastcol"{% endif %}>
-                <a href="{% url wc-package-detail package_name=app.package_name  %}"><img class="icon64" src="{{ app.icon_url_or_default }}"/></a>
-                <h4><a href="{% url wc-package-detail package_name=app.package_name  %}">{{ app.name }}</a></h4>
+                <a href="{% url 'wc-package-detail' package_name=app.package_name  %}"><img class="icon64" src="{{ app.icon_url_or_default }}"/></a>
+                <h4><a href="{% url 'wc-package-detail' package_name=app.package_name  %}">{{ app.name }}</a></h4>
                 <p>{{ app.departments.all.0.name }} | <b>{% if app.price %}${{ app.price }}{% else %}FREE{% endif %}</b></p>
                 <p>{{ app.comment }}</p>
                 {% if ratings %}

=== modified file 'src/webcatalog/templates/webcatalog/application_detail.html'
--- src/webcatalog/templates/webcatalog/application_detail.html	2012-09-06 10:38:18 +0000
+++ src/webcatalog/templates/webcatalog/application_detail.html	2013-04-15 13:23:28 +0000
@@ -5,13 +5,13 @@
 {% block title %}{{ application.name }} &mdash; Ubuntu Apps Directory{% endblock %}
 {% block header %}{{ application.name }}{% endblock %}
 {% block head_extra %}
-<link rel="stylesheet" type="text/css" href="{% url wc-combo %}?light/css/reset.css&light/css/styles.css&css/webcatalog.css&light/css/forms.css&css/carousel.css"/>
-<script src="{% url wc-combo %}?yui/3.4.0/build/yui/yui-min.js&js/carousel.js&js/screenshots.js"></script>
+<link rel="stylesheet" type="text/css" href="{% url 'wc-combo' %}?light/css/reset.css&light/css/styles.css&css/webcatalog.css&light/css/forms.css&css/carousel.css"/>
+<script src="{% url 'wc-combo' %}?yui/3.4.0/build/yui/yui-min.js&js/carousel.js&js/screenshots.js"></script>
 <script>
-YUI({combine: true, comboBase: '{% url wc-combo %}?', root: 'yui/3.4.0/build/'}).use('io-base', 'node-base', function (Y) {
+YUI({combine: true, comboBase: '{% url 'wc-combo' %}?', root: 'yui/3.4.0/build/'}).use('io-base', 'node-base', function (Y) {
 
     // XXX michaeln 2011-09-16 bug=851660 Autoload further batches of results.
-    var reviews_uri = "{% url wc-package-reviews-ajax application.distroseries.code_name application.package_name %}";
+    var reviews_uri = "{% url 'wc-package-reviews-ajax' application.distroseries.code_name application.package_name %}";
     Y.io(reviews_uri, {
         on: {
             complete: function(id, response){
@@ -25,7 +25,7 @@
     });
     var recommends_div = Y.one('.portlet.recommendedportlet');
     if (recommends_div){
-        var recommendations_uri = "{% url wc-package-recommends application.package_name %}";
+        var recommendations_uri = "{% url 'wc-package-recommends' application.package_name %}";
         Y.io(recommendations_uri, {
             on: {
                 complete: function(id, response){
@@ -59,7 +59,7 @@
                     {% ifequal distroseries.code_name requested_series_codename %}
                       <span>{% include "webcatalog/distroseries_snippet.html" %}</span>
                     {% else %}
-                      <a href="{% url wc-package-detail distroseries.code_name application.package_name %}">{% include "webcatalog/distroseries_snippet.html" %}</a>
+                      <a href="{% url 'wc-package-detail' distroseries.code_name application.package_name %}">{% include "webcatalog/distroseries_snippet.html" %}</a>
                     {% endifequal %}</li>
                 {% endfor %}
             </ul>
@@ -142,7 +142,7 @@
     <div class="reviews">
       <h2>{% trans "Reviews" %}</h2>
       <div id="reviews_placeholder">
-      <a href="{% url wc-package-reviews application.distroseries.code_name application.package_name %}">
+      <a href="{% url 'wc-package-reviews' application.distroseries.code_name application.package_name %}">
           {% blocktrans %}View the reviews for this app{% endblocktrans %}</a>
       </div>
     </div>

=== modified file 'src/webcatalog/templates/webcatalog/application_list_snippet.html'
--- src/webcatalog/templates/webcatalog/application_list_snippet.html	2012-05-08 06:42:38 +0000
+++ src/webcatalog/templates/webcatalog/application_list_snippet.html	2013-04-15 13:23:28 +0000
@@ -4,11 +4,11 @@
   <tr>
     <td class="app-icon">
     
-    <a href="{% if distroseries %}{% url wc-package-detail app.distroseries.code_name app.package_name %}{% else %}{% url wc-package-detail app.package_name %}{% endif %}"><img src="{{ app.icon_url_or_default }}" class="icon32"/></a>
+    <a href="{% if distroseries %}{% url 'wc-package-detail' app.distroseries.code_name app.package_name %}{% else %}{% url 'wc-package-detail' app.package_name %}{% endif %}"><img src="{{ app.icon_url_or_default }}" class="icon32"/></a>
     </td>
     <td class="app-description">
         <h3>
-        <a href="{% if distroseries %}{% url wc-package-detail app.distroseries.code_name app.package_name %}{% else %}{% url wc-package-detail app.package_name %}{% endif %}">{{ app.name }}</a>
+        <a href="{% if distroseries %}{% url 'wc-package-detail' app.distroseries.code_name app.package_name %}{% else %}{% url 'wc-package-detail' app.package_name %}{% endif %}">{{ app.name }}</a>
         </h3>
         <p>{{ app.comment }}</p>
     </td>

=== modified file 'src/webcatalog/templates/webcatalog/base.html'
--- src/webcatalog/templates/webcatalog/base.html	2012-06-28 14:27:43 +0000
+++ src/webcatalog/templates/webcatalog/base.html	2013-04-15 13:23:28 +0000
@@ -4,12 +4,12 @@
 {% block menus %}{% endblock %}
 
 {% block head_extra %}
-    <link rel="stylesheet" type="text/css" href="{% url wc-combo %}?light/css/reset.css&light/css/styles.css&css/webcatalog.css&light/css/forms.css"/>
+    <link rel="stylesheet" type="text/css" href="{% url 'wc-combo' %}?light/css/reset.css&light/css/styles.css&css/webcatalog.css&light/css/forms.css"/>
 {% endblock %}
 
 {% block search %}
 <div id="search-box">
-    <form id="sitesearch" action="{% url wc-search %}" method="get">
+    <form id="sitesearch" action="{% url 'wc-search' %}" method="get">
       <input type="text" maxlength="128" name="q" id="search-box-input"
              placeholder="Search for an app" title="Add some words that describe the app or the app's name."
       />
@@ -22,7 +22,7 @@
 <div class="footer-div">
   <p class="footer-title">Legal</p>
   <ul>
-    <li><a href="{% url wc-tos %}">Terms of Service</a></li>
+    <li><a href="{% url 'wc-tos' %}">Terms of Service</a></li>
     <li><a href="https://one.ubuntu.com/privacy/">Privacy Policy</a></li>
   </ul>
 </div>

=== modified file 'src/webcatalog/templates/webcatalog/department_overview.html'
--- src/webcatalog/templates/webcatalog/department_overview.html	2012-05-08 06:42:38 +0000
+++ src/webcatalog/templates/webcatalog/department_overview.html	2013-04-15 13:23:28 +0000
@@ -26,7 +26,7 @@
                     {% ifequal ds.code_name distroseries %}
                         <span>Ubuntu {{ ds.version }} ({{ ds.code_name }})</span>
                     {% else %}
-                        <a href="{% url wc-department distro=ds.code_name dept_slug_or_id=dept.slug %}">Ubuntu {{ ds.version }} ({{ ds.code_name }})</a>
+                        <a href="{% url 'wc-department' distro=ds.code_name dept_slug_or_id=dept.slug %}">Ubuntu {{ ds.version }} ({{ ds.code_name }})</a>
                     {% endifequal %}</li>
                 {% endfor %}
             </ul>

=== modified file 'src/webcatalog/templates/webcatalog/department_overview_snippet.html'
--- src/webcatalog/templates/webcatalog/department_overview_snippet.html	2012-04-05 01:09:37 +0000
+++ src/webcatalog/templates/webcatalog/department_overview_snippet.html	2013-04-15 13:23:28 +0000
@@ -1,5 +1,5 @@
 <li class="department">
-    <a href="{% url wc-department dept_slug_or_id=dept.slug %}">
+    <a href="{% url 'wc-department' dept_slug_or_id=dept.slug %}">
     <div class="dept-icon">
     <img width="24" height="24"
     src="{{ STATIC_URL }}images/dept_icons/{{ dept.slug }}.png"/>

=== modified file 'src/webcatalog/templates/webcatalog/exhibits_widget.html'
--- src/webcatalog/templates/webcatalog/exhibits_widget.html	2012-08-21 13:47:14 +0000
+++ src/webcatalog/templates/webcatalog/exhibits_widget.html	2013-04-15 13:23:28 +0000
@@ -20,7 +20,7 @@
     </div>
 </div>
 <script type="text/javascript">
-YUI({combine: true, comboBase: '{% url wc-combo %}?', root: 'yui/3.4.0/build/'}).use('uwc-carousel', function(Y) {
+YUI({combine: true, comboBase: '{% url 'wc-combo' %}?', root: 'yui/3.4.0/build/'}).use('uwc-carousel', function(Y) {
     var caro = new Y.uwc.Carousel({
         nodeContainer: "#exhibits-carousel",
         controlsContainer: "#exhibits-carousel",

=== modified file 'src/webcatalog/templates/webcatalog/featured_apps_widget.html'
--- src/webcatalog/templates/webcatalog/featured_apps_widget.html	2012-04-18 15:15:56 +0000
+++ src/webcatalog/templates/webcatalog/featured_apps_widget.html	2013-04-15 13:23:28 +0000
@@ -6,7 +6,7 @@
 {% endwith %}
 </div>
 <script type="text/javascript">
-YUI({combine: true, comboBase: '{% url wc-combo %}?', root: 'yui/3.4.0/build/'}).use('uwc-carousel', function(Y) {
+YUI({combine: true, comboBase: '{% url 'wc-combo' %}?', root: 'yui/3.4.0/build/'}).use('uwc-carousel', function(Y) {
     var caro = new Y.uwc.Carousel({
         nodeContainer: "#featured-carousel .carousel",
         controlsContainer: "#featured-carousel .carousel-controls",

=== modified file 'src/webcatalog/templates/webcatalog/index.html'
--- src/webcatalog/templates/webcatalog/index.html	2012-04-18 10:38:33 +0000
+++ src/webcatalog/templates/webcatalog/index.html	2013-04-15 13:23:28 +0000
@@ -6,8 +6,8 @@
 {% block search %}{% endblock %}
 
 {% block head_extra %}
-    <link rel="stylesheet" type="text/css" href="{% url wc-combo %}?light/css/reset.css&light/css/styles.css&css/webcatalog.css&light/css/forms.css&css/carousel.css"/>
-    <script src="{% url wc-combo %}?yui/3.4.0/build/yui/yui-min.js&js/carousel.js"></script>
+    <link rel="stylesheet" type="text/css" href="{% url 'wc-combo' %}?light/css/reset.css&light/css/styles.css&css/webcatalog.css&light/css/forms.css&css/carousel.css"/>
+    <script src="{% url 'wc-combo' %}?yui/3.4.0/build/yui/yui-min.js&js/carousel.js"></script>
 {% endblock %}
 
 
@@ -35,7 +35,7 @@
 <h3>{% trans "Search for an app" %}:</h3>
 
 <div id="search-box" class="main">
-    <form id="sitesearch" action="{% url wc-search %}" method="get">
+    <form id="sitesearch" action="{% url 'wc-search' %}" method="get">
       <input type="text" maxlength="128" name="q" id="search-box-input"
           title="Add some words that describe the app or the app's name."/>
       <button type="submit" name="op" id="search-box-button"><span>go</span></button>

=== modified file 'src/webcatalog/templates/webcatalog/recommended_apps_widget.html'
--- src/webcatalog/templates/webcatalog/recommended_apps_widget.html	2012-04-20 18:33:58 +0000
+++ src/webcatalog/templates/webcatalog/recommended_apps_widget.html	2013-04-15 13:23:28 +0000
@@ -4,7 +4,7 @@
 <ul class="portletactions">
 {% for app in recommended_apps %}
   <li>
-    <a href="{% url wc-package-detail package_name=app.package_name  %}">
+    <a href="{% url 'wc-package-detail' package_name=app.package_name  %}">
     <div class="top-rated-stars">
     {% rating_summary app.ratings_average 'small' app.ratings_total %}
     </div>

=== modified file 'src/webcatalog/templates/webcatalog/search_results.html'
--- src/webcatalog/templates/webcatalog/search_results.html	2012-05-08 06:42:38 +0000
+++ src/webcatalog/templates/webcatalog/search_results.html	2013-04-15 13:23:28 +0000
@@ -15,7 +15,7 @@
                     {% ifequal ds.code_name distroseries %}
                         <span>Ubuntu {{ ds.version }} ({{ ds.code_name }})</span>
                     {% else %}
-                        <a href="{% url wc-search ds.code_name %}?q={{query}}">Ubuntu {{ ds.version }} ({{ ds.code_name }})</a>
+                        <a href="{% url 'wc-search' ds.code_name %}?q={{query}}">Ubuntu {{ ds.version }} ({{ ds.code_name }})</a>
                     {% endifequal %}</li>
                 {% endfor %}
             </ul>

=== modified file 'src/webcatalog/templates/webcatalog/task_list.html'
--- src/webcatalog/templates/webcatalog/task_list.html	2012-06-29 19:51:06 +0000
+++ src/webcatalog/templates/webcatalog/task_list.html	2013-04-15 13:23:28 +0000
@@ -5,7 +5,7 @@
 {% block header %}{% trans "Schedule asynchronous tasks" %}{% endblock %}
 {% block head_extra %}
     {{ block.super }}
-<script src="{% url wc-combo %}?yui/3.4.0/build/yui/yui-min.js"></script>
+<script src="{% url 'wc-combo' %}?yui/3.4.0/build/yui/yui-min.js"></script>
 <style type="text/css">
 div.task button {
     width: 200px;
@@ -22,7 +22,7 @@
 }
 </style>
 <script>
-YUI({combine: true, comboBase: '{% url wc-combo %}?', root: 'yui/3.4.0/build/'}).use('io-base', 'node-base', function (Y) {
+YUI({combine: true, comboBase: '{% url 'wc-combo' %}?', root: 'yui/3.4.0/build/'}).use('io-base', 'node-base', function (Y) {
     var check_status = function(task_id, message) {
         var check_uri = "/cat/task_status/" + task_id + '/';
         var UNREADY_STATES = ["PENDING", "RECEIVED", "STARTED", "RETRY"];

=== modified file 'src/webcatalog/templates/webcatalog/top_rated_apps_widget.html'
--- src/webcatalog/templates/webcatalog/top_rated_apps_widget.html	2012-04-18 15:15:56 +0000
+++ src/webcatalog/templates/webcatalog/top_rated_apps_widget.html	2013-04-15 13:23:28 +0000
@@ -6,7 +6,7 @@
 {% endwith %}
 </div>
 <script type="text/javascript">
-YUI({combine: true, comboBase: '{% url wc-combo %}?', root: 'yui/3.4.0/build/'}).use('uwc-carousel', function(Y) {
+YUI({combine: true, comboBase: '{% url 'wc-combo' %}?', root: 'yui/3.4.0/build/'}).use('uwc-carousel', function(Y) {
     var caro = new Y.uwc.Carousel({
         nodeContainer: "#top-rated-carousel .carousel",
         controlsContainer: "#top-rated-carousel .carousel-controls",

=== modified file 'src/webcatalog/tests/factory.py'
--- src/webcatalog/tests/factory.py	2012-09-06 10:08:33 +0000
+++ src/webcatalog/tests/factory.py	2013-04-15 13:23:28 +0000
@@ -20,6 +20,8 @@
 from __future__ import absolute_import
 
 import os
+import pytz
+
 from datetime import (
     datetime,
     timedelta,
@@ -244,7 +246,7 @@
     def make_session(self, expire_date=None):
         if expire_date is None:
             secs = self.get_unique_integer()
-            expire_date = datetime.now() + timedelta(seconds=secs)
+            expire_date = datetime.now(pytz.utc) + timedelta(seconds=secs)
         return Session.objects.create(
             session_key=self.get_unique_string(prefix='key-'),
             session_data=self.get_unique_string(prefix='session-data-'),

=== modified file 'src/webcatalog/tests/test_commands.py'
--- src/webcatalog/tests/test_commands.py	2013-02-18 21:55:09 +0000
+++ src/webcatalog/tests/test_commands.py	2013-04-15 13:23:28 +0000
@@ -22,8 +22,10 @@
 import apt
 import json
 import os
+import pytz
 import shutil
 import tempfile
+
 from datetime import (
     datetime,
     timedelta,
@@ -760,7 +762,7 @@
 
     def test_updates_last_import_record(self):
         onion = self.factory.make_distroseries(code_name='onion')
-        orig_timestamp = datetime(2011, 07, 18, 14, 43)
+        orig_timestamp = datetime(2011, 07, 18, 14, 43, tzinfo=pytz.utc)
         ReviewStatsImport.objects.create(
             distroseries=onion, last_import=orig_timestamp)
 
@@ -784,7 +786,7 @@
         # If there has been a recent import, we'll only grab the
         # relevant stats.
         onion = self.factory.make_distroseries(code_name='onion')
-        orig_timestamp = datetime.utcnow() - timedelta(2)
+        orig_timestamp = datetime.now(pytz.utc) - timedelta(2)
         ReviewStatsImport.objects.create(
             distroseries=onion, last_import=orig_timestamp)
 
@@ -797,8 +799,8 @@
         # If the download_all option is used, all stats are
         # downloaded, rather than the optimised last X days.
         onion = self.factory.make_distroseries(code_name='onion')
-        orig_timestamp = datetime.utcnow() - timedelta(2)
-        import_record = ReviewStatsImport.objects.create(
+        orig_timestamp = datetime.now(pytz.utc) - timedelta(2)
+        ReviewStatsImport.objects.create(
             distroseries=onion, last_import=orig_timestamp)
 
         call_command('import_ratings_stats', 'onion', download_all=True)
@@ -1093,12 +1095,12 @@
 All done.
 '''
         actual_output = ''.join(
-            str(call[0][0]) for call in self.mock_stdout.write.call_args_list)
+            str(c[0][0]) for c in self.mock_stdout.write.call_args_list)
         self.assertEqual(expected_output, actual_output)
 
     @skipUnless(connection.vendor == 'postgresql', "Requires postgresql")
     def test_cleanup_nonces(self):
-        now = datetime.now()
+        now = datetime.now(pytz.utc)
         for i in range(8):
             created_at = now - timedelta(seconds=5000 * i)
             self.factory.make_nonce(created_at=created_at)
@@ -1120,7 +1122,7 @@
         self.check_expected_output()
 
     def create_django_sessions(self):
-        now = datetime.now()
+        now = datetime.now(pytz.utc)
         for i in range(8):
             expire_date = now + timedelta(seconds=5000 * (4 - i))
             self.factory.make_session(expire_date=expire_date)
@@ -1131,7 +1133,7 @@
 
         call_command('cleanup', 'django_session', batch_secs=0)
 
-        self.assertEqual(0, Session.objects.count())
+        self.assertEqual(4, Session.objects.count())
 
 
 class ImportAllAppInstallDataTestCase(TestCaseWithFactory):

=== modified file 'src/webcatalog/tests/test_preflight.py'
--- src/webcatalog/tests/test_preflight.py	2012-10-17 07:46:31 +0000
+++ src/webcatalog/tests/test_preflight.py	2013-04-15 13:23:28 +0000
@@ -85,7 +85,7 @@
             'preflight',
         ])
         expected_checks = set([
-            ('validate_config', True),
+            ('validate_config', False),
             ('database', True),
             ('rnr_available', True),
             ('identity_provider_available', True),

=== modified file 'src/webcatalog/tests/test_views.py'
--- src/webcatalog/tests/test_views.py	2013-03-01 16:28:52 +0000
+++ src/webcatalog/tests/test_views.py	2013-04-15 13:23:28 +0000
@@ -399,7 +399,7 @@
 
         self.assertNotContains(response,
                                'Success. Your download link has been sent.')
-        self.assertContains(response, 'Enter a valid e-mail address.')
+        self.assertContains(response, 'Enter a valid email address.')
 
     def test_version_and_label_displayed(self):
         app = self.factory.make_application(

=== modified file 'src/webcatalog/views.py'
--- src/webcatalog/views.py	2013-03-01 12:49:55 +0000
+++ src/webcatalog/views.py	2013-04-15 13:23:28 +0000
@@ -109,7 +109,7 @@
     paginator = Paginator(apps, settings.PAGE_BATCH_SIZE)
     page_num = _get_page_num_from_request(request, paginator)
 
-    context = RequestContext(request, dict={
+    context = RequestContext(request, {
         'query': query,
         'page': paginator.page(page_num),
         'breadcrumbs': crumbs,
@@ -140,7 +140,7 @@
         if len(top_rated) == settings.NUMBER_TOP_RATED_APPS:
             break
 
-    context = RequestContext(request, dict={
+    context = RequestContext(request, {
         'depts': depts,
         'exhibits': exhibits,
         'featured_apps': featured_apps,

=== modified file 'test_requirements.txt'
--- test_requirements.txt	2012-03-26 16:29:35 +0000
+++ test_requirements.txt	2013-04-15 13:23:28 +0000
@@ -1,9 +1,4 @@
-# django should not be required here, but without it `python setup.py develop`
-# complains with:
-# Installed /.../virtualenv/lib/python2.6/site-packages/django_preflight-0.1-py2.6.egg
-# error: Could not find required distribution django
 -f bzr+http://bazaar.launchpad.net/~elachuni/canonical-identity-provider/ssoclient#egg=ssoclient-1.0
-django<1.4
 coverage
 mock
 piston-mini-client