| Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class
|
|
|
|
aware datetimes
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Fix OAuth 2 token only
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
to avoid naming collision with `oauth2` used for OAuth 1
|
|
|
|
- alias oauth2 as oauth
- remove rouge print
- remove docstring markups
- OAuthAuthentication.authenticate() now returns (user, token) two-tuple on success
- don't set request.user because it's already set
|
|
As per:
http://blog.python.org/2013/02/announcing-defusedxml-fixes-for-xml.html
|
|
|
|
Most of these had obvious exceptions which would be thrown. Some I'm not
sure about but they should at least catch only Exception so as not to
ignore SystemExit and other inappropriate Error classes.
|
|
|
|
|
|
working
Conflicts:
rest_framework/authentication.py
rest_framework/relations.py
rest_framework/serializers.py
rest_framework/settings.py
rest_framework/tests/authentication.py
rest_framework/tests/genericrelations.py
rest_framework/tests/generics.py
rest_framework/tests/relations_hyperlink.py
rest_framework/tests/relations_nested.py
rest_framework/tests/relations_pk.py
rest_framework/tests/serializer.py
|
|
|
|
|
|
|
|
|
|
into patch-support
|
|
1.6 import compatability
|
|
|
|
|
|
|
|
|
|
|
|
|