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

[Łukasz Czyżykowski]

Upgrade to Django 1.5.1

Upgrade to Django 1.5.1

[Martin Albisetti (beuno)]

+1 minus a small typo.

review: Approve

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

96. By Łukasz Czyżykowski on 2013-04-16

Fixed typo.

=== modified file 'django_project/config/main.cfg'
--- django_project/config/main.cfg	2013-02-22 16:47:48 +0000
+++ django_project/config/main.cfg	2013-04-16 12:25:30 +0000
@@ -1,9 +1,6 @@
 [django]
 authentication_backends = django_openid_auth.auth.OpenIDBackend
                           django.contrib.auth.backends.ModelBackend
-database_engine = sqlite3
-database_host =
-database_name = test.db
 debug = false
 email_host = localhost
 email_port = 1025
@@ -50,7 +47,7 @@
 default = default_database
 
 [default_database]
-engine = postgresql_psycopg2
+engine = django.db.backends.postgresql_psycopg2
 name = recommender
 user = postgres
 host = /tmp

=== modified file 'django_project/urls.py'
--- django_project/urls.py	2012-09-28 21:24:33 +0000
+++ django_project/urls.py	2013-04-16 12:25:30 +0000
@@ -1,9 +1,9 @@
 import preflight
 from django.conf import settings
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, include, url
 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()
@@ -12,7 +12,6 @@
 handler404 = 'recommender.views.page_not_found'
 
 urlpatterns = patterns('',
-    # Django's admin site:
     (r'^admin/', include(admin.site.urls)),
 
     # django-openid-auth's stuff
@@ -25,5 +24,5 @@
 
     # The recommender app gets everything else
     (r'^', include('recommender.urls')),
-    (r'^$', redirect_to, {'url': 'http://www.ubuntu.com/'}),
+    (r'^$', RedirectView.as_view(url='http://www.ubuntu.com/'))
 )

=== modified file 'requirements.txt'
--- requirements.txt	2013-02-22 16:27:37 +0000
+++ requirements.txt	2013-04-16 12:25:30 +0000
@@ -1,14 +1,15 @@
 bzr
 configglue==1.0.1
 coverage
-django==1.3
-django-configglue==0.6.1
+django==1.5.1
+django-configglue==0.7
 -e bzr+http://bazaar.launchpad.net/~canonical-isd-hackers/django-pgtools/trunk
 -e bzr+http://bazaar.launchpad.net/~django-openid-auth/django-openid-auth/trunk
 django-piston==0.2.2.1
 fabric
 mock
 pep8
+pytz
 piston-mini-client
 python-openid
 south==0.7.3

=== modified file 'src/recommender/api/__init__.py'
--- src/recommender/api/__init__.py	2011-12-06 15:39:39 +0000
+++ src/recommender/api/__init__.py	2013-04-16 12:25:30 +0000
@@ -0,0 +1,13 @@
+# Bit of surgery on piston 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/recommender/auth.py'
--- src/recommender/auth.py	2012-08-23 18:01:55 +0000
+++ src/recommender/auth.py	2013-04-16 12:25:30 +0000
@@ -23,8 +23,9 @@
 __all__ = [
     'SSOOAuthAuthentication',
 ]
-
+import pytz
 import logging
+
 from datetime import datetime, timedelta
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -89,7 +90,7 @@
         if self.is_valid_request(request):
             try:
                 consumer, token, parameters = self.validate_token(request)
-            except (OAuthError, oauth.OAuthError), err:
+            except (OAuthError, oauth.OAuthError):
                 return False
             if consumer and token:
                 request.user = token.user
@@ -107,7 +108,7 @@
         tokens = Token.objects.filter(
             token=oauthtoken, consumer__key=consumer_key)
         if len(tokens) == 0 or (tokens[0].updated_at <
-                                datetime.now() - TOKEN_CACHE_EXPIRY):
+                                datetime.now(pytz.utc) - TOKEN_CACHE_EXPIRY):
             self.logger.debug('No token found, prefetching %s' % consumer_key)
             pieces = web_services.get_data_for_account(
                 token=oauthtoken,

=== modified file 'src/recommender/managers.py'
--- src/recommender/managers.py	2013-02-19 14:07:25 +0000
+++ src/recommender/managers.py	2013-04-16 12:25:30 +0000
@@ -25,7 +25,7 @@
 ]
 
 import json
-from datetime import datetime, timedelta
+
 from random import random
 
 from django.conf import settings

=== modified file 'src/recommender/models/data.py'
--- src/recommender/models/data.py	2012-02-09 10:07:08 +0000
+++ src/recommender/models/data.py	2013-04-16 12:25:30 +0000
@@ -20,6 +20,8 @@
 from __future__ import absolute_import
 __metaclass__ = type
 
+import pytz
+
 from datetime import datetime
 from django.db import models
 from .package import Package
@@ -54,6 +56,7 @@
     def create_or_update_from_dict(cls, data):
         date_created = datetime.strptime(
             data['date_created'], "%Y-%m-%d %H:%M:%S")
+        date_created = date_created.replace(tzinfo=pytz.utc)
         try:
             data_item = cls.objects.get(
                 package__name=data['package_name'],

=== modified file 'src/recommender/models/recommendations.py'
--- src/recommender/models/recommendations.py	2012-09-28 21:24:33 +0000
+++ src/recommender/models/recommendations.py	2013-04-16 12:25:30 +0000
@@ -29,6 +29,7 @@
     'UserRecommendation',
     'ImplicitFeedback',
 ]
+import pytz
 
 from datetime import datetime
 
@@ -48,7 +49,8 @@
     rid = models.CharField(max_length=32, db_index=True)
     data = models.TextField()
     feedback = models.IntegerField(blank=True, null=True)
-    date_created = models.DateTimeField(default=datetime.utcnow)
+    date_created = models.DateTimeField(
+        default=lambda: datetime.now(pytz.utc))
 
     class Meta:
         app_label = 'recommender'

=== modified file 'src/recommender/tests/test_api.py'
--- src/recommender/tests/test_api.py	2013-02-18 19:42:50 +0000
+++ src/recommender/tests/test_api.py	2013-04-16 12:25:30 +0000
@@ -37,8 +37,6 @@
 
 from mock import patch
 
-from datetime import datetime, timedelta
-
 from django.conf import settings
 from django.core.cache import cache
 from django.core.urlresolvers import reverse

=== modified file 'src/recommender/tests/test_commands.py'
--- src/recommender/tests/test_commands.py	2013-02-25 12:35:09 +0000
+++ src/recommender/tests/test_commands.py	2013-04-16 12:25:30 +0000
@@ -31,6 +31,8 @@
 
 import json
 import sys
+import pytz
+
 from cStringIO import StringIO
 from datetime import date, datetime, timedelta
 
@@ -212,7 +214,7 @@
 class RecommendationCleanupTestCase(TransactionTestCase):
 
     def test_running_command_removes_stale_app_recommendations(self):
-        month_ago = datetime.utcnow() - timedelta(days=31)
+        month_ago = datetime.now(pytz.utc) - timedelta(days=31)
         self.factory.make(3, AppRecommendation,
                           date_created=month_ago)
         self.factory.make_one(AppRecommendation, feedback=1,
@@ -225,7 +227,7 @@
         self.assertEqual(2, AppRecommendation.objects.count())
 
     def test_running_command_removes_stale_user_recommendations(self):
-        month_ago = datetime.utcnow() - timedelta(days=31)
+        month_ago = datetime.now(pytz.utc) - timedelta(days=31)
         self.factory.make(3, UserRecommendation,
                           date_created=month_ago)
         self.factory.make_one(UserRecommendation, feedback=1,
@@ -240,7 +242,7 @@
     def test_running_command_takes_into_account_passed_number_of_days(self):
         self.factory.make_one(
             AppRecommendation,
-            date_created=(datetime.utcnow() - timedelta(days=11)))
+            date_created=(datetime.now(pytz.utc) - timedelta(days=11)))
 
         call_command('recommendation_cleanup', 10)
 

=== modified file 'src/recommender/tests/test_managers.py'
--- src/recommender/tests/test_managers.py	2013-02-19 14:07:25 +0000
+++ src/recommender/tests/test_managers.py	2013-04-16 12:25:30 +0000
@@ -17,6 +17,8 @@
 
 """Tests for the recommender manager objects."""
 
+import pytz
+
 from datetime import datetime
 from django_factory import TestCase
 from mock import patch
@@ -52,8 +54,8 @@
             (0.51, False),
         ]
         refresh_chance = 0.5
-        package = self.factory.make_one(Package, name='inkscape')
-        start = datetime.now()
+        self.factory.make_one(Package, name='inkscape')
+        start = datetime.now(pytz.utc)
         with patch_settings(APPRECOMMENDATION_REFRESH_CHANCE=refresh_chance):
             for case, refresh in cases:
                 mock_random.return_value = case

=== modified file 'src/recommender/tests/test_models_data.py'
--- src/recommender/tests/test_models_data.py	2012-02-06 07:54:27 +0000
+++ src/recommender/tests/test_models_data.py	2013-04-16 12:25:30 +0000
@@ -22,6 +22,7 @@
 __all__ = [
     'RatingsAndReviewsDataItemTestCase',
 ]
+import pytz
 
 from datetime import timedelta
 
@@ -47,6 +48,8 @@
         data_item = method(
             RatingsAndReviewsDataItem, package=package, language='en',
             person_identification=person_identification)
+        data_item.date_created = (
+            data_item.date_created.replace(tzinfo=pytz.utc))
         return data_item
 
     def test_create_or_update_when_no_object_in_the_database(self):

=== modified file 'src/recommender/urls.py'
--- src/recommender/urls.py	2013-02-20 17:30:06 +0000
+++ src/recommender/urls.py	2013-04-16 12:25:30 +0000
@@ -17,8 +17,7 @@
 
 """URL pattern declarations."""
 
-from django.conf import settings
-from django.conf.urls.defaults import (
+from django.conf.urls import (
     include,
     patterns,
     url,