Fix some deprecation warnings

matthiask · matthiask · commit 40355d17cab9 · 2015-08-21T09:22:54.000+02:00
diff --git a/feincms/contrib/preview/urls.py b/feincms/contrib/preview/urls.py
@@ -1,10 +1,9 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from feincms.contrib.preview.views import PreviewHandler
 
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^(.*)/_preview/(\d+)/$', PreviewHandler.as_view(),
         name='feincms_preview'),
-)
+]
diff --git a/feincms/module/medialibrary/modeladmins.py b/feincms/module/medialibrary/modeladmins.py
@@ -124,20 +124,17 @@ class MediaFileAdmin(ExtensionModelAdmin):
     actions = [assign_category, save_as_zipfile]
 
     def get_urls(self):
-        from django.conf.urls import patterns, url
+        from django.conf.urls import include, url
 
-        urls = super(MediaFileAdmin, self).get_urls()
-        my_urls = patterns(
-            '',
+        return [
             url(
                 r'^mediafile-bulk-upload/$',
                 self.admin_site.admin_view(MediaFileAdmin.bulk_upload),
                 {},
                 name='mediafile_bulk_upload',
             ),
-        )
-
-        return my_urls + urls
+            url('', include(super(MediaFileAdmin, self).get_urls())),
+        ]
 
     def changelist_view(self, request, extra_context=None):
         if extra_context is None:
diff --git a/feincms/module/page/forms.py b/feincms/module/page/forms.py
@@ -163,7 +163,7 @@ def clean(self):
         try:
             # XXX Django 1.7 allows asking
             # apps.is_installed('django.contrib.sites')
-            self._meta.model._meta.get_field_by_name('site')
+            self._meta.model._meta.get_field('site')
         except FieldDoesNotExist:
             pass
         else:
diff --git a/feincms/urls.py b/feincms/urls.py
@@ -1,14 +1,13 @@
 # flake8: noqa
 from __future__ import absolute_import
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from feincms.views.cbv.views import Handler
 
 handler = Handler.as_view()
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^$', handler, name='feincms_home'),
     url(r'^(.*)/$', handler, name='feincms_handler'),
-)
+]
diff --git a/feincms/utils/queryset_transform.py b/feincms/utils/queryset_transform.py
@@ -14,7 +14,7 @@
 
     def lookup_tags(item_qs):
         item_pks = [item.pk for item in item_qs]
-        m2mfield = Item._meta.get_field_by_name('tags')[0]
+        m2mfield = Item._meta.get_field('tags')[0]
         tags_for_item = Tag.objects.filter(
             item__in = item_pks
         ).extra(select = {
