From b6762471afa2f47f79fa079abce95dd83d3556e0 Mon Sep 17 00:00:00 2001 From: Zhaobang Liu Date: Wed, 28 Mar 2018 10:39:24 -0700 Subject: [PATCH 1/2] new way to get url --- ios_notifications/__init__.py | 2 +- ios_notifications/admin.py | 10 +++------- setup.py | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ios_notifications/__init__.py b/ios_notifications/__init__.py index eb8e8f0..cda6d84 100644 --- a/ios_notifications/__init__.py +++ b/ios_notifications/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -VERSION = '0.2' +VERSION = '0.2.1' diff --git a/ios_notifications/admin.py b/ios_notifications/admin.py index 6c87577..584215c 100644 --- a/ios_notifications/admin.py +++ b/ios_notifications/admin.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- -try: - from django.conf.urls import patterns, url -except ImportError: # deprecated since Django 1.4 - from django.conf.urls.defaults import patterns, url +from django.conf.urls import url from django.contrib import admin from django.template.response import TemplateResponse @@ -34,9 +31,8 @@ class NotificationAdmin(admin.ModelAdmin): def get_urls(self): urls = super(NotificationAdmin, self).get_urls() - notification_urls = patterns('', - url(r'^(?P\d+)/push-notification/$', self.admin_site.admin_view(self.admin_push_notification), - name='admin_push_notification'),) + notification_urls = [url(r'^(?P\d+)/push-notification/$', self.admin_site.admin_view(self.admin_push_notification), + name='admin_push_notification')] return notification_urls + urls def admin_push_notification(self, request, **kwargs): diff --git a/setup.py b/setup.py index 0085b22..158621d 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ 'Topic :: Software Development :: Libraries :: Application Frameworks', ], install_requires=[ - 'Django>=1.3', + 'Django>=1.8', 'pyOpenSSL>=0.10', 'django-fields>=0.2.2' ], From 88ff456eafdce84f71aab8a05977b5caa7718182 Mon Sep 17 00:00:00 2001 From: Zhaobang Liu Date: Wed, 28 Mar 2018 11:15:38 -0700 Subject: [PATCH 2/2] urls.py --- ios_notifications/urls.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/ios_notifications/urls.py b/ios_notifications/urls.py index 83bb090..3edfd5e 100644 --- a/ios_notifications/urls.py +++ b/ios_notifications/urls.py @@ -1,13 +1,9 @@ # -*- coding: utf-8 -*- -try: - from django.conf.urls import patterns, url -except ImportError: # deprecated since Django 1.4 - from django.conf.urls.defaults import patterns, url - +from django.conf.urls import url from .api import routes -urlpatterns = patterns('', +urlpatterns = [ url(r'^device/$', routes.device, name='ios-notifications-device-create'), url(r'^device/(?P\w+)/(?P\d+)/$', routes.device, name='ios-notifications-device'), -) +]