Merge lp:~lucyllewy/loco-team-portal/django-1.4 into lp:loco-team-portal

[Lucy Llewellyn]

Update to django 1.4

[Lucy Llewellyn (lucyllewy)]

I'm working on upgrading beyond 1.4 through to 1.10. I'm doing this piecemeal so that it is easy to see every step in the journey and be able to rollback if needed.

[Adnane Belmadiaf (daker)]

Sorry it took me so long, but this looks good and tests are passing.

review: Approve

[Lucy Llewellyn (lucyllewy)]

Is there anything further I need to do? I see, Adnane, you approved the change, but I'm unclear what the next steps are to get this merged into the main branch, as I'm not a member of the project team so can't do it myself.

Unmerged revisions

685. By Lucy Llewellyn on 2016-08-05

update to django 1.4

=== modified file 'loco_directory/events/feeds.py'
--- loco_directory/events/feeds.py	2013-03-31 01:15:06 +0000
+++ loco_directory/events/feeds.py	2016-08-05 01:15:41 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from django.core.urlresolvers import reverse
-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.translation import ugettext as _
 from django.utils import translation
 from django.template import loader, Context

=== modified file 'loco_directory/events/urls.py'
--- loco_directory/events/urls.py	2013-03-11 21:49:37 +0000
+++ loco_directory/events/urls.py	2016-08-05 01:15:41 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('',
     #all events

=== modified file 'loco_directory/manage.py'
--- loco_directory/manage.py	2011-06-29 18:35:40 +0000
+++ loco_directory/manage.py	2016-08-05 01:15:41 +0000
@@ -1,11 +1,9 @@
 #!/usr/bin/env python
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
+import os, sys
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
\ No newline at end of file

=== modified file 'loco_directory/meetings/feeds.py'
--- loco_directory/meetings/feeds.py	2013-03-31 01:10:52 +0000
+++ loco_directory/meetings/feeds.py	2016-08-05 01:15:41 +0000
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from django.core.urlresolvers import reverse
-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils import translation
 from django.template import loader, Context
 

=== modified file 'loco_directory/meetings/urls.py'
--- loco_directory/meetings/urls.py	2013-04-14 23:00:20 +0000
+++ loco_directory/meetings/urls.py	2016-08-05 01:15:41 +0000
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('',
     #all meetings

=== modified file 'loco_directory/services/urls.py'
--- loco_directory/services/urls.py	2011-01-22 16:05:24 +0000
+++ loco_directory/services/urls.py	2016-08-05 01:15:41 +0000
@@ -3,7 +3,7 @@
 
 @author: mhall
 '''
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('',
     #venues

=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2013-03-31 01:10:52 +0000
+++ loco_directory/settings.py	2016-08-05 01:15:41 +0000
@@ -128,7 +128,7 @@
     "common.context_processors.languages_menu",
 )
 
-ROOT_URLCONF = 'loco_directory.urls'
+ROOT_URLCONF = 'urls'
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".

=== modified file 'loco_directory/teams/feeds.py'
--- loco_directory/teams/feeds.py	2013-03-31 01:10:52 +0000
+++ loco_directory/teams/feeds.py	2016-08-05 01:15:41 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django.contrib.syndication.feeds import Feed, FeedDoesNotExist
+from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.translation import ugettext as _
 from django.utils import translation
 

=== modified file 'loco_directory/teams/urls.py'
--- loco_directory/teams/urls.py	2013-02-19 22:23:46 +0000
+++ loco_directory/teams/urls.py	2016-08-05 01:15:41 +0000
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('',
     url(r'^$', 'teams.views.team_list', name='team-list'),

=== modified file 'loco_directory/urls.py'
--- loco_directory/urls.py	2013-10-30 00:31:14 +0000
+++ loco_directory/urls.py	2016-08-05 01:15:41 +0000
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 from django.conf import settings
 from django.contrib import admin
 import ubuntu_website
@@ -42,7 +42,7 @@
     url(r'^jsi18n', 'django.views.i18n.javascript_catalog', name='jsi18n'),
     url(r'^services/', include('services.urls')),
     url(r'^search/', 'common.views.site_search', name='site_search'),
-    url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}, name='feed_view'),
+    url(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.Feed', {'feed_dict': feeds}, name='feed_view'),
     url(r'^', include('userprofiles.urls')),
 )
 

=== modified file 'loco_directory/userprofiles/urls.py'
--- loco_directory/userprofiles/urls.py	2013-03-11 21:49:37 +0000
+++ loco_directory/userprofiles/urls.py	2016-08-05 01:15:41 +0000
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('userprofiles.views',
     url(r'^(?P<username>[-+.\w]+)/$', 'profile_detail', name='profile-detail'),

=== modified file 'loco_directory/venues/urls.py'
--- loco_directory/venues/urls.py	2013-02-21 20:31:16 +0000
+++ loco_directory/venues/urls.py	2016-08-05 01:15:41 +0000
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 urlpatterns = patterns('',
     #venues

=== modified file 'requirements/dev.txt'
--- requirements/dev.txt	2014-05-15 22:50:21 +0000
+++ requirements/dev.txt	2016-08-05 01:15:41 +0000
@@ -6,14 +6,14 @@
 #       include patches applied by the package maintainers.
 #
 
-Django==1.3.3
+Django==1.4
 South==0.7.3
-distribute==0.6.10
-django-openid-auth==0.4
+setuptools==25.1.4
+django-openid-auth==0.5
 python-openid==2.2.4
 pytz==2010b
 python-dateutil==1.5
-vobject==0.8.1c
+vobject==0.9.2
 simplejson==2.0.9
 feedparser
 python-gettext

=== modified file 'requirements/prod.txt'
--- requirements/prod.txt	2016-02-12 00:54:37 +0000
+++ requirements/prod.txt	2016-08-05 01:15:41 +0000
@@ -6,16 +6,16 @@
 #       include patches applied by the package maintainers.
 #
 
-Django==1.3.3
+Django==1.4
 South==0.7.3
-distribute==0.6.10
-django-openid-auth==0.4
+setuptools==25.1.4
+django-openid-auth==0.5
 # pyscopg is only needed for production like environments
 # psycopg2==2.0.13
 python-openid==2.2.4
 pytz==2010b
 python-dateutil==1.5
-vobject==0.8.2
+vobject==0.9.2
 simplejson==2.0.9
 feedparser
 python-gettext