Merge pull request #77 from valenmope/master

Support for Django 1.10

.gitignore

@@ -6,3 +6,4 @@ build
 .DS_Store
 dist
 *.egg-info
+env/

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<id>\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):

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<token>\w+)/(?P<service__id>\d+)/$', routes.device, name='ios-notifications-device'),
-)
+]

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

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
 )