Merge lp://staging/~nataliabidart/django-openid-auth/django-1.7-1.8 into lp://staging/~django-openid-auth/django-openid-auth/trunk
Proposed by
Natalia Bidart
| Status: | Merged |
|---|---|
| Approved by: | Ricardo Kirkner |
| Approved revision: | 120 |
| Merged at revision: | 113 |
| Proposed branch: | lp://staging/~nataliabidart/django-openid-auth/django-1.7-1.8 |
| Merge into: | lp://staging/~django-openid-auth/django-openid-auth/trunk |
| Diff against target: |
3554 lines (+1062/-1033) 30 files modified
.bzrignore (+5/-6) Makefile (+3/-4) django_openid_auth/__init__.py (+0/-1) django_openid_auth/admin.py (+37/-19) django_openid_auth/auth.py (+27/-21) django_openid_auth/exceptions.py (+12/-3) django_openid_auth/forms.py (+9/-7) django_openid_auth/management/commands/openid_cleanup.py (+2/-0) django_openid_auth/migrations/0001_initial.py (+55/-0) django_openid_auth/models.py (+4/-5) django_openid_auth/signals.py (+2/-0) django_openid_auth/store.py (+5/-1) django_openid_auth/teams.py (+19/-17) django_openid_auth/tests/__init__.py (+5/-15) django_openid_auth/tests/helpers.py (+2/-0) django_openid_auth/tests/test_admin.py (+21/-39) django_openid_auth/tests/test_auth.py (+169/-184) django_openid_auth/tests/test_models.py (+1/-5) django_openid_auth/tests/test_settings.py (+34/-15) django_openid_auth/tests/test_store.py (+2/-5) django_openid_auth/tests/test_views.py (+481/-558) django_openid_auth/tests/urls.py (+6/-2) django_openid_auth/urls.py (+6/-3) django_openid_auth/views.py (+32/-22) example_consumer/settings.py (+70/-80) example_consumer/urls.py (+8/-7) example_consumer/wsgi.py (+14/-0) manage.py (+1/-1) setup.py (+1/-1) tox.ini (+29/-12) |
| To merge this branch: | bzr merge lp://staging/~nataliabidart/django-openid-auth/django-1.7-1.8 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ricardo Kirkner | Approve | ||
|
Review via email:
|
|||
Commit message
- Migrated base code to support Django 1.4-1.8.
- General code and tests cleanup, fixed all the pep8 errors.
Description of the change
All tests passing:
_______
py2.7-django1.4: commands succeeded
py2.7-django1.5: commands succeeded
py2.7-django1.6: commands succeeded
py2.7-django1.7: commands succeeded
py2.7-django1.8: commands succeeded
congratulations :)
To post a comment you must log in.
Revision history for this message
| Ricardo Kirkner (ricardokirkner) | # |
Revision history for this message
| Natalia Bidart (nataliabidart) | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM. Great stuff, thanks!