Skip to content

Commit d48a786

Browse files
authored
Merge pull request #4 from doordash/fork_more
Fork more to support django 1.11
2 parents 362a498 + 88ff456 commit d48a786

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

ios_notifications/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# -*- coding: utf-8 -*-
22

3-
VERSION = '0.2'
3+
VERSION = '0.2.1'

ios_notifications/admin.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# -*- coding: utf-8 -*-
22

3-
try:
4-
from django.conf.urls import patterns, url
5-
except ImportError: # deprecated since Django 1.4
6-
from django.conf.urls.defaults import patterns, url
3+
from django.conf.urls import url
74

85
from django.contrib import admin
96
from django.template.response import TemplateResponse
@@ -34,9 +31,8 @@ class NotificationAdmin(admin.ModelAdmin):
3431

3532
def get_urls(self):
3633
urls = super(NotificationAdmin, self).get_urls()
37-
notification_urls = patterns('',
38-
url(r'^(?P<id>\d+)/push-notification/$', self.admin_site.admin_view(self.admin_push_notification),
39-
name='admin_push_notification'),)
34+
notification_urls = [url(r'^(?P<id>\d+)/push-notification/$', self.admin_site.admin_view(self.admin_push_notification),
35+
name='admin_push_notification')]
4036
return notification_urls + urls
4137

4238
def admin_push_notification(self, request, **kwargs):

ios_notifications/urls.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
# -*- coding: utf-8 -*-
22

3-
try:
4-
from django.conf.urls import patterns, url
5-
except ImportError: # deprecated since Django 1.4
6-
from django.conf.urls.defaults import patterns, url
7-
3+
from django.conf.urls import url
84
from .api import routes
95

10-
urlpatterns = patterns('',
6+
urlpatterns = [
117
url(r'^device/$', routes.device, name='ios-notifications-device-create'),
128
url(r'^device/(?P<token>\w+)/(?P<service__id>\d+)/$', routes.device, name='ios-notifications-device'),
13-
)
9+
]

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
'Topic :: Software Development :: Libraries :: Application Frameworks',
2525
],
2626
install_requires=[
27-
'Django>=1.3',
27+
'Django>=1.8',
2828
'pyOpenSSL>=0.10',
2929
'django-fields>=0.2.2'
3030
],

0 commit comments

Comments
 (0)