Now ready for Django 1.4 upgrade

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())

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 *

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 *

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)

members/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('members.views',
 	(r'^$', 'home'),

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

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
 #

staff/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('staff.views',
     (r'^$', 'todo'),

tablet/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('tablet.views',
 	(r'^$', 'signin'),

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<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', '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'),
 
 )