From 416c25636e5c1aa25f8b4cda24e42958090c8b8c Mon Sep 17 00:00:00 2001 From: Jacob Sayles Date: Fri, 4 Jan 2013 14:01:08 -0800 Subject: [PATCH] Now ready for Django 1.4 upgrade --- arpwatch/api.py | 5 +++-- arpwatch/urls.py | 2 +- interlink/urls.py | 2 +- manage.py | 15 +++++---------- members/urls.py | 2 +- requirements.txt | 8 ++++---- settings.py | 13 ++++++++----- staff/urls.py | 2 +- tablet/urls.py | 2 +- urls.py | 6 +++--- 10 files changed, 28 insertions(+), 29 deletions(-) diff --git a/arpwatch/api.py b/arpwatch/api.py index 047cd4dd3..a3c33c709 100644 --- a/arpwatch/api.py +++ b/arpwatch/api.py @@ -14,7 +14,7 @@ from django.core.urlresolvers import reverse from django.contrib.sites.models import Site from django.contrib.auth.decorators import login_required -from django.conf.urls.defaults import patterns, include, url +from django.conf.urls import patterns, include, url from django.shortcuts import render_to_response, get_object_or_404 from django.contrib.admin.views.decorators import staff_member_required from django.http import HttpResponse, Http404, HttpResponseServerError, HttpResponseRedirect, HttpResponsePermanentRedirect @@ -83,4 +83,5 @@ def get_object_list(self, request): return [self.obj_get({'pk':0})] def obj_get_list(self, request=None, **kwargs): return self.get_object_list(request) def obj_get(self, request=None, **kwargs): return ActivityModel() -API.register(ActivityResource()) +# Turning off for now -JLS +#API.register(ActivityResource()) diff --git a/arpwatch/urls.py b/arpwatch/urls.py index b817dadd2..fdbaf794d 100755 --- a/arpwatch/urls.py +++ b/arpwatch/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import * from django.conf import settings from models import * diff --git a/interlink/urls.py b/interlink/urls.py index 9c6941512..3fd2d2d8d 100644 --- a/interlink/urls.py +++ b/interlink/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import * from django.conf import settings from models import * diff --git a/manage.py b/manage.py index beb4475fe..01b647576 100755 --- a/manage.py +++ b/manage.py @@ -1,14 +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 traceback - traceback.print_exc() - 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 diff --git a/members/urls.py b/members/urls.py index bb5eac765..8a8d43025 100644 --- a/members/urls.py +++ b/members/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import * urlpatterns = patterns('members.views', (r'^$', 'home'), diff --git a/requirements.txt b/requirements.txt index deae6a4fc..c37a87478 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ -django==1.3.1 +django south -psycopg2==2.4.1 +psycopg2 pil feedparser django-taggit django-taggit-templatetags -celery==2.5.1 -django-celery==2.5.1 +celery +django-celery git+git://github.com/toastdriven/django-tastypie.git#egg=django-tastypie diff --git a/settings.py b/settings.py index 475f85eb5..a1287eb10 100755 --- a/settings.py +++ b/settings.py @@ -56,11 +56,11 @@ # URL that handles login LOGIN_URL='/login/' -# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a -# trailing slash. -# Examples: "http://foo.com/media/", "/media/". -#ADMIN_MEDIA_PREFIX = 'https://secure.officenomads.com/staff/media/admin/' -ADMIN_MEDIA_PREFIX = '/static/admin/' +# Auth Backends +AUTHENTICATION_BACKENDS = ( + 'backends.EmailOrUsernameModelBackend', + 'django.contrib.auth.backends.ModelBackend' +) # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( @@ -109,6 +109,9 @@ 'tablet', ) +# New Django 1.4 timezone support +USE_TZ = False + # # Celery initialization # diff --git a/staff/urls.py b/staff/urls.py index 599ba2b91..74b1e374a 100755 --- a/staff/urls.py +++ b/staff/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import * urlpatterns = patterns('staff.views', (r'^$', 'todo'), diff --git a/tablet/urls.py b/tablet/urls.py index 807637d2b..8798bf9ab 100755 --- a/tablet/urls.py +++ b/tablet/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import * urlpatterns = patterns('tablet.views', (r'^$', 'signin'), diff --git a/urls.py b/urls.py index d527976d8..3fba6394c 100755 --- a/urls.py +++ b/urls.py @@ -1,11 +1,11 @@ -from django.conf.urls.defaults import * +from django.conf.urls import * from django.contrib import admin from django.conf import settings from django.http import HttpResponse admin.autodiscover() -from nadine import API +#from nadine import API urlpatterns = patterns('', (r'^robots\.txt$', lambda r: HttpResponse("User-agent: *\nDisallow: /", mimetype="text/plain")), @@ -28,7 +28,7 @@ (r'^reset/(?P[0-9A-Za-z]+)-(?P.+)/$', 'django.contrib.auth.views.password_reset_confirm', {'template_name': 'password_reset_confirm.html'}), (r'^reset/complete/$', 'django.contrib.auth.views.password_reset_complete', {'template_name': 'password_reset_complete.html'}), - (r'^api/', include(API.urls)), + #(r'^api/', include(API.urls)), (r'^$', 'views.index'), )