mirror of
https://github.com/pacnpal/django-anymail.git
synced 2025-12-20 11:51:05 -05:00
Django 1.8 alpha 1 support
* Test on Python 2.7, 3.4, pypy. * Call super.setUpClass in DjrillAdminTests. https://docs.djangoproject.com/en/dev/releases/1.8/#overriding-setupclass-teardownclass-in-test-cases Also clear up some new PendingDeprecationWarnings, where the changes can easily remain compatible back to Django 1.3: * Remove deprecated django.conf.urls.patterns. (And match Django recommendations in our docs.) https://docs.djangoproject.com/en/dev/releases/1.8/#django-conf-urls-patterns * Remove deprecated SimpleTestCase.urls. (We've already back-ported @override_settings for testing older Django versions.) https://docs.djangoproject.com/en/dev/releases/1.8/#django-test-simpletestcase-urls
This commit is contained in:
@@ -1,16 +1,18 @@
|
||||
try:
|
||||
from django.conf.urls import include, patterns, url
|
||||
from django.conf.urls import include, url
|
||||
except ImportError:
|
||||
# Django 1.3
|
||||
from django.conf.urls.defaults import include, patterns, url
|
||||
from django.conf.urls.defaults import include, url
|
||||
|
||||
from django.contrib import admin
|
||||
|
||||
from djrill import DjrillAdminSite
|
||||
|
||||
# Set up the DjrillAdminSite as suggested in the docs
|
||||
|
||||
admin.site = DjrillAdminSite()
|
||||
admin.autodiscover()
|
||||
|
||||
urlpatterns = patterns('',
|
||||
urlpatterns = [
|
||||
url(r'^admin/', include(admin.site.urls)),
|
||||
)
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user