Skip to content

Python 2.6 support #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 19, 2013
Merged

Python 2.6 support #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
548c77e
Add python 2.6 support
Dec 18, 2013
b284e9a
Add python 2.6 to travis, tox and setup file
Dec 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: python
python:
- "2.6"
- "2.7"

install:
Expand Down
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions oauth2_provider/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
20 changes: 19 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 =
Expand Down