Merge pull request #11 from takeflight/dj110-compatability

Added django 1.10 compatibility

.travis.yml

@@ -16,6 +16,8 @@ env:
     - DJANGO='19' WAGTAIL='14'
     - DJANGO='18' WAGTAIL='15'
     - DJANGO='19' WAGTAIL='15'
+    - DJANGO='19' WAGTAIL='16'
+    - DJANGO='110' WAGTAIL='16'
 
 before_install:
     # - sudo add-apt-repository ppa:mc3man/trusty-media -y // Inlcudes all multimedia options but 404s currently :(

tox.ini

@@ -2,23 +2,24 @@
 skip_missing_interpreters = True
 
 envlist =
-	py{27,34,35}-dj{18,19}-wt{14,15}
+	# Wagtail LTS
+	py{27,34,35}-dj{18,19}-wt14
+	# Last version
+	py{27,34,35}-dj{18,19}-wt15
+	# Current version
+	py{27,34,35}-dj{19,110}-wt16
 
 
 [testenv]
-commands=python runtests.py {posargs}
-usedevelop = True
+commands = python runtests.py {posargs}
 pip_pre = True
 
-basepython =
-	py27: python2.7
-	py34: python3.4
-	py35: python3.5
-
 deps =
 	mock
 	dj18: Django~=1.8.0
 	dj19: Django~=1.9.0
+	dj110: Django~=1.10.0
 	wt13: wagtail~=1.3.0
 	wt14: wagtail~=1.4.0
 	wt15: wagtail~=1.5.0
+	wt16: wagtail~=1.6.0

wagtailvideos/templatetags/wagtailvideos_tags.py

@@ -4,9 +4,7 @@ import mimetypes
 
 from django import template
 from django.forms.widgets import flatatt
-from django.template import resolve_variable
 from django.utils.text import mark_safe
-
 from wagtailvideos.models import MediaFormats, Video
 
 register = template.Library()