Django upgrade

cyder/api/authtoken/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns(
     'cyder.api.authtoken.views',

cyder/base/eav/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from cyder.base.eav.views import search
 

cyder/base/tablefier.py

@@ -47,40 +47,45 @@ def views(self):
         if self.custom:
             return False
 
-        views = hasattr(self.first_obj, 'views')
-        return views
+        return 'views' in self.klass._meta.get_all_field_names()
 
     @cached_property
     def headers(self):
         headers = []
-        if self.custom:
-            data = self.custom(self.first_obj)['data']
-        else:
-            data = self.first_obj.details()['data']
-
-        for title, sort_field, value in data:
-            headers.append([title, sort_field])
-
-        if self.extra_cols:
-            for col in self.extra_cols:
-                headers.append([col['header'], col['sort_field']])
-
         if self.views:
             headers.append(['Views', None])
             if hasattr(self.objects, 'object_list'):
                 self.objects.object_list = (
                     self.objects.object_list.prefetch_related('views'))
 
+        if self.extra_cols:
+            for col in self.extra_cols:
+                headers.append([col['header'], col['sort_field']])
+
         if self.can_update:
             headers.append(['Actions', None])
 
-        if hasattr(self.objects, 'object_list'):
-            self.objects.object_list = (self.objects.object_list
-                .select_related(*[f for _, f in headers if f]))
+        def optimize(hdrs):
+            if hasattr(self.objects, 'object_list'):
+                self.objects.object_list = (self.objects.object_list
+                    .select_related(*[f for _, f in hdrs if f]))
 
+        optimize(headers)
+
+        # TODO: find a way to check for add_info without calling the reverse
+        # url resolver on a specific object
         if self.add_info:
             headers.insert(0, ['Info', None])
 
+        # TODO: make details a class method so we can optimize this
+        if self.custom:
+            data = self.custom(self.first_obj)['data']
+        else:
+            data = self.first_obj.details()['data']
+
+        for title, sort_field, value in data:
+            headers.append([title, sort_field])
+
         return headers
 
     @cached_property

cyder/core/ctnr/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from cyder.core.ctnr.views import (add_object, remove_object, change_ctnr,
                                    ctnr_detail, update_user)

cyder/core/cyuser/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from cyder.core.cyuser.views import (
     clone_perms, clone_perms_check, delete, set_default_ctnr)
 

cyder/core/system/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 from cyder.core.system.views import system_create_view, system_detail
 from cyder.core.urls import core_urls

cyder/core/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import include, patterns, url
+from django.conf.urls import include, patterns, url
 
 from cyder.core.views import (core_index, core_view, core_table_update,
                               core_search_obj)

cyder/cydhcp/build/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 from cyder.cydhcp.build.views import *
 

cyder/cydhcp/interface/dynamic_intr/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from cyder.cydhcp.urls import cydhcp_urls
 from cyder.cydhcp.views import cydhcp_create
 from cyder.cydhcp.interface.dynamic_intr.views import dynamic_intr_detail

cyder/cydhcp/interface/static_intr/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 from cyder.cydhcp.urls import cydhcp_urls
 from cyder.cydhcp.views import cydhcp_create
 from cyder.cydhcp.interface.static_intr.views import static_intr_detail

cyder/cydhcp/interface/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from cyder.cydhcp.interface.views import interface_delete
 

cyder/cydhcp/network/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from cyder.cydhcp.network.views import network_detail
 from cyder.cydhcp.urls import cydhcp_urls

cyder/cydhcp/range/forms.py

@@ -16,7 +16,7 @@ class Meta:
         widgets = {'views': forms.CheckboxSelectMultiple,
                    'range_type': forms.RadioSelect,
                    'ip_type': forms.RadioSelect}
-        exclude = 'range_usage'
+        exclude = ('range_usage',)
 
     def __init__(self, *args, **kwargs):
         super(RangeForm, self).__init__(*args, **kwargs)

cyder/cydhcp/range/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 from cyder.cydhcp.range.views import (redirect_to_range_from_ip, range_detail,
                                       search)

cyder/cydhcp/site/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 from cyder.cydhcp.urls import cydhcp_urls
 from cyder.cydhcp.site.views import site_detail

cyder/cydhcp/urls.py

@@ -1,5 +1,5 @@
-from django.conf.urls.defaults import include, patterns, url
-from django.views.generic.simple import direct_to_template
+from django.conf.urls import include, patterns, url
+from django.views.generic.base import TemplateView
 
 from cyder.cydhcp.views import (cydhcp_view, cydhcp_table_update,
                                 cydhcp_search_obj)
@@ -20,8 +20,7 @@ def cydhcp_urls(object_type):
 
 urlpatterns = patterns(
     '',
-    url(r'^$', direct_to_template, {'template': 'cydhcp/cydhcp_index.html'},
-        name='cydhcp-index'),
+    url(r'^$', TemplateView.as_view(template_name='cydhcp/cydhcp_index.html'), name='cydhcp-index'),
     url(r'^record/search/', cydhcp_search_obj, name='cydhcp-search-record'),
     url(r'^build/', include('cyder.cydhcp.build.urls')),
     url(r'^network/', include('cyder.cydhcp.network.urls')),

cyder/cydhcp/vlan/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 from cyder.cydhcp.vlan.views import vlan_detail
 from cyder.cydhcp.urls import cydhcp_urls
 

cyder/cydhcp/vrf/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 from cyder.cydhcp.urls import cydhcp_urls
 from cyder.cydhcp.vrf.views import vrf_detail

cyder/cydhcp/workgroup/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 from cyder.cydhcp.urls import cydhcp_urls
 from cyder.cydhcp.workgroup.views import workgroup_detail, search

cyder/cydns/address_record/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 from cyder.cydns.urls import cydns_urls
 from cyder.cydns.address_record.views import address_record_detail

cyder/cydns/cname/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 from cyder.cydns.urls import cydns_urls
 

cyder/cydns/cybind/urls.py

@@ -1,4 +1,4 @@
-import django.conf.urls.defaults as defaults
+import django.conf.urls as defaults
 
 import cydns.cybind.views as views
 

cyder/cydns/domain/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 from cyder.cydns.urls import cydns_urls
 from cyder.cydns.domain.views import domain_detail, get_all_domains, search

cyder/cydns/mx/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 from cyder.cydns.urls import cydns_urls
 

cyder/cydns/nameserver/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 from cyder.cydns.nameserver.views import *
 from cyder.cydns.urls import cydns_urls

cyder/cydns/ptr/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 from cyder.cydns.urls import cydns_urls
 

cyder/cydns/soa/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from cyder.cydns.soa.views import delete_soa_attr, soa_detail
 from cyder.cydns.urls import cydns_urls

cyder/cydns/srv/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 from cyder.cydns.urls import cydns_urls
 

cyder/cydns/sshfp/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 from cyder.cydns.urls import cydns_urls
 

cyder/cydns/txt/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 from cyder.cydns.urls import cydns_urls
 

cyder/cydns/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import include, patterns, url
+from django.conf.urls import include, patterns, url
 
 from cyder.cydns.views import *
 from cyder.cydns.constants import DNS_EAV_MODELS

cyder/cydns/view/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 from cyder.cydns.view.views import *
 

cyder/search/urls.py

@@ -1,5 +1,5 @@
-from django.conf.urls.defaults import patterns, url
-from django.views.generic.simple import direct_to_template
+from django.conf.urls import patterns, url
+from django.views.generic.base import TemplateView
 
 from search.views import search_ajax, search_dns_text, get_zones_json
 from search.views import search
@@ -9,7 +9,6 @@
     url(r'^search_ajax', search_ajax),
     url(r'^search_dns_text', search_dns_text),
     url(r'^get_zones_json', get_zones_json),
-    url(r'^help/$', direct_to_template,
-        {'template': 'search/search_help.html'}, name='search-help'),
+    url(r'^help/$', TemplateView.as_view(template_name='search/search_help.html'), name='search-help'),
     url(r'^$', search, name='search'),
 )

cyder/settings/base.py

@@ -361,7 +361,6 @@ def JINJA_CONFIG():
     'south',
     'django_cas',
     'djcelery',
-    'django_extensions',
     'django_nose',
     'jingo_minify',
     'rest_framework',
@@ -394,6 +393,9 @@ def JINJA_CONFIG():
 SESSION_COOKIE_NAME = 'cyder'
 SESSION_COOKIE_SECURE = False
 
+# NOTE: PickleSerializer considered risky, JSONSerializer support added in 1.5
+SESSION_SERIALIZER = "django.contrib.sessions.serializers.PickleSerializer"
+
 AUTH_PROFILE_MODULE = 'cyder.UserProfile'
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',

cyder/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import include, patterns, url
+from django.conf.urls import include, patterns, url
 from django.conf import settings
 from django.contrib import admin
 

manage.py

@@ -2,7 +2,6 @@
 import os
 import site
 import sys
-from django.core.management import execute_manager
 
 from lib.path_utils import path, import_mod_by_name, _dot_lookup, ROOT
 

requirements/dev.txt

@@ -3,7 +3,6 @@
 # package for developers (testing, docs, etc.), it goes in this file.
 
 django-debug-toolbar==0.9.4
-django-extensions
 
 -r prod.txt