From 23a7ad8cb3c0d0cc49c3025551947b41ba368f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valent=C3=ADn=20Moreno?= Date: Thu, 20 Oct 2016 09:57:25 +0200 Subject: [PATCH 1/4] adding support for Django1.10 --- .gitignore | 1 + requirements.txt | 2 +- setup.py | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 182fbc2..6b37c43 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ build .DS_Store dist *.egg-info +env/ diff --git a/requirements.txt b/requirements.txt index 2b61af8..80454d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -django-fields==0.2.2 +django-fields==0.3.0 pyOpenSSL==0.13.1 pycrypto==2.6 wsgiref==0.1.2 diff --git a/setup.py b/setup.py index f1e8456..9b2f6a7 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,10 @@ install_requires=[ 'Django>=1.3', 'pyOpenSSL>=0.10', - 'django-fields>=0.2.2' + 'django-fields>=0.3.0' ], + dependency_links=[ + 'https://github.com/nautilebleu/django-fields/tarball/master#egg=django-fields-0.3.0', + ], zip_safe=False ) From 2de7b913cbc528d17e5c78b05c1fbf19c28e4f42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valent=C3=ADn=20Moreno?= Date: Thu, 20 Oct 2016 10:26:06 +0200 Subject: [PATCH 2/4] replace old patterns --- ios_notifications/admin.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/ios_notifications/admin.py b/ios_notifications/admin.py index 6c87577..b2a6ce9 100644 --- a/ios_notifications/admin.py +++ b/ios_notifications/admin.py @@ -1,14 +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 django.contrib import admin from django.template.response import TemplateResponse from django.shortcuts import get_object_or_404 - from .models import Device, Notification, APNService, FeedbackService from .forms import APNServiceForm @@ -34,9 +29,9 @@ class NotificationAdmin(admin.ModelAdmin): def get_urls(self): urls = super(NotificationAdmin, self).get_urls() - notification_urls = patterns('', + notification_urls = ['', url(r'^(?P\d+)/push-notification/$', self.admin_site.admin_view(self.admin_push_notification), - name='admin_push_notification'),) + name='admin_push_notification'),] return notification_urls + urls def admin_push_notification(self, request, **kwargs): From 7a3639d11e5fc9fa374aba5d08405f1a63c06ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valent=C3=ADn=20Moreno?= Date: Fri, 21 Oct 2016 17:00:30 +0200 Subject: [PATCH 3/4] remove urlpatterns --- 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..33dd7c7 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'), -) +] From 869f797157ce28cce810f080229ea93baf625c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Valent=C3=ADn=20Moreno?= Date: Fri, 21 Oct 2016 17:05:46 +0200 Subject: [PATCH 4/4] fix on urls --- ios_notifications/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios_notifications/urls.py b/ios_notifications/urls.py index 33dd7c7..3edfd5e 100644 --- a/ios_notifications/urls.py +++ b/ios_notifications/urls.py @@ -3,7 +3,7 @@ from django.conf.urls import url from .api import routes -urlpatterns = ['', +urlpatterns = [ url(r'^device/$', routes.device, name='ios-notifications-device-create'), url(r'^device/(?P\w+)/(?P\d+)/$', routes.device, name='ios-notifications-device'), ]