Merge pull request #89 from xray7224/python26

Python 2.6 support

Author: Massimiliano Pippi

.travis.yml

@@ -1,5 +1,6 @@
 language: python
 python:
+  - "2.6"
   - "2.7"
 
 install:

README.rst

@@ -41,7 +41,7 @@ guidelines <https://django-oauth-toolkit.readthedocs.org/en/latest/contributing.
 Requirements
 ------------
 
-* Python 2.7, 3.3
+* Python 2.6 2.7, 3.3
 * Django 1.4, 1.5, 1.6
 
 Installation

oauth2_provider/models.py

@@ -96,7 +96,7 @@ def clean(self):
             and self.authorization_grant_type \
             in (AbstractApplication.GRANT_AUTHORIZATION_CODE,
                 AbstractApplication.GRANT_IMPLICIT):
-            error = _('Redirect_uris could not be empty with {} grant_type')
+            error = _('Redirect_uris could not be empty with {0} grant_type')
             raise ValidationError(error.format(self.authorization_grant_type))
 
     def get_absolute_url(self):
@@ -232,6 +232,6 @@ def get_application_model():
         raise ImproperlyConfigured(e)
     app_model = get_model(app_label, model_name)
     if app_model is None:
-        e = "APPLICATION_MODEL refers to model {} that has not been installed"
+        e = "APPLICATION_MODEL refers to model {0} that has not been installed"
         raise ImproperlyConfigured(e.format(oauth2_settings.APPLICATION_MODEL))
     return app_model

setup.py

@@ -30,6 +30,7 @@ def get_version(package):
         "Framework :: Django",
         "License :: OSI Approved :: BSD License",
         "Operating System :: OS Independent",
+        "Programming Language :: Python :: 2.6"
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.3",
         "Topic :: Software Development :: Libraries :: Python Modules",

tox.ini

@@ -1,12 +1,30 @@
 [tox]
-envlist = py27-django14,py27-django15,py33-django15,py27-django16,py33-django16
+envlist = py26-django14,py26-django15,py26-django16,py27-django14,py27-django15,py33-django15,py27-django16,py33-django16
 
 [testenv]
 downloadcache = {toxworkdir}/cache/
 commands={envpython} runtests.py
 deps =
     -r{toxinidir}/requirements/optional.txt
 
+[testenv:py26-django14]
+basepython = python2.6
+deps =
+    Django==1.4.8
+    {[testenv]deps}
+
+[testenv:py26-django15]
+basepython = python2.6
+deps =
+    Django==1.5.4
+    {[testenv]deps}
+
+[testenv:py26-django16]
+basepython = python2.6
+deps =
+    Django==1.6.1
+    {[testenv]deps}
+
 [testenv:py27-django14]
 basepython = python2.7
 deps =