Merge lp://staging/~wesmason/django-saml2-idp/django1.6 into lp://staging/~ubuntuone-pqm-team/django-saml2-idp/stable
Proposed by
Wes Mason
| Status: | Merged |
|---|---|
| Approved by: | Ricardo Kirkner |
| Approved revision: | 73 |
| Merged at revision: | 68 |
| Proposed branch: | lp://staging/~wesmason/django-saml2-idp/django1.6 |
| Merge into: | lp://staging/~ubuntuone-pqm-team/django-saml2-idp/stable |
| Diff against target: |
96 lines (+28/-7) 3 files modified
idptest/saml2idp/urls.py (+6/-1) idptest/saml2idp/views.py (+16/-4) idptest/urls.py (+6/-2) |
| To merge this branch: | bzr merge lp://staging/~wesmason/django-saml2-idp/django1.6 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ricardo Kirkner (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add django 1.6 compatibility
Description of the change
Hi,
This adds Django 1.6 support, required for Ye Olde SSO upgrade, which I've attempted to get merged upstream here: https:/
I attempted to maintain compatibility with <1.6 and kept to the same style as the project's code.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM, but please fix the pep8 issue before globally approving