Fixes Django 1.10 url pattern

.travis.yml

@@ -4,27 +4,23 @@ cache:
   - pip
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
-  - "pypy"
-  - "pypy3"
+  - "3.5"
 env:
   global:
     - DISPLAY=:99.0
   matrix:
-    - DJANGO="<1.6,>=1.5"
-    - DJANGO="<1.7,>=1.6"
-    - DJANGO="<1.8,>=1.7"
-    - DJANGO="<1.9,>=1.8"
-
+    - DJANGO="Django<1.9,>=1.8"
+    - DJANGO="Django<1.10,>=1.9"
+    - DJANGO="-e git+https://github.com/django/django.git@master#egg=Django"
 matrix:
+  fast_finish: true
   allow_failures:
-    - env: DJANGO="<1.6,>=1.5"
-    - env: DJANGO="<1.7,>=1.6"
+    - env: DJANGO="-e git+https://github.com/django/django.git@master#egg=Django"
 install:
   - pip install --upgrade pip
   - pip install .
-  - pip install Django$DJANGO
+  - pip install $DJANGO
   - pip install -U pytest pytest-django selenium
   - pip install -U flake8 pep8-naming isort pep257
   - pip install -U coveralls
@@ -33,6 +29,6 @@ script:
   - isort --check-only --recursive --diff .
   - flake8 --jobs=2 .
   - pep257 s3file
-  - coverage run --source=s3file runtests.py
+  - coverage run --source=s3file -m 'pytest'
 after_success:
   - coveralls

s3file/forms.py

@@ -17,7 +17,6 @@
 
 
 class S3FileInput(ClearableFileInput):
-
     """FileInput that uses JavaScript to directly upload to Amazon S3."""
 
     needs_multipart_form = False

s3file/urls.py

@@ -1,11 +1,10 @@
 from __future__ import absolute_import, unicode_literals
 
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 
 from .views import S3FileView
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url('^s3file/sign',
         S3FileView.as_view(), name='s3file-sign'),
-)
+]

s3file/views.py

@@ -23,7 +23,6 @@
 
 
 class S3FileViewMixin(object):
-
     """
     Mixin to handle file upload signing for S3 buckets.
 
@@ -109,7 +108,6 @@ def sign(self):
 
 
 class S3FileView(S3FileViewMixin, View):
-
     """View to sign upload requests to an S3 bucket."""
 
     def post(self, request, *args, **kwargs):

setup.cfg

@@ -9,14 +9,13 @@ statistics = true
 show-source = true
 
 [pep257]
-ignore = D100,D102,D103
-explain = true
-count = true
+add-ignore = D100,D102,D103,D104
 
 [isort]
 atomic = true
 multi_line_output = 5
 line_length = 79
 skip = manage.py
-known_first_party = s3file
+known_first_party = s3file,tests
+known_third_party = django
 combine_as_imports = true

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name='django-s3file',
-    version='1.1.0',
+    version='1.2.0',
     description='A lightweight Fine Uploader input for Django and Amazon S3',
     author='codingjoe',
     url='https://github.com/codingjoe/django-s3file',

tests/testapp/settings.py

@@ -34,9 +34,12 @@
 MEDIA_URL = '/s3/'
 SITE_ID = 1
 
-TEMPLATE_DIRS = (
-    os.path.join(BASE_DIR, "templates"),
-)
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'APP_DIRS': True,
+    },
+]
 
 USE_L10N = True
 

tests/testapp/urls.py

@@ -1,13 +1,12 @@
 # -*- coding:utf-8 -*-
 from __future__ import absolute_import, unicode_literals
 
-from django.conf.urls import include, patterns, url
+from django.conf.urls import include, url
 from django.views.generic import FormView
 
 from . import forms, views
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^s3file/', include('s3file.urls')),
     url(r'^s3/$',
         views.S3MockView.as_view(), name='s3mock'),
@@ -17,4 +16,4 @@
             template_name='form.html',
             success_url='/upload/'
         ), name='upload'),
-)
+]