Tom Christie
baaa356489
Merge master
2014-12-12 15:37:43 +00:00
Tom Christie
65d6cba75f
Merge pull request #2200 from maryokhin/master
...
Clean up compat code
2014-12-05 13:14:14 +00:00
Tymur Maryokhin
d54c67d79d
Removed custom StringIO, force_text, smart_text compat
2014-12-04 03:11:42 +01:00
Tom Christie
3d6620c72a
Merge
2014-12-03 23:24:06 +00:00
Tom Christie
f74e52b31e
Merge
2014-12-03 23:14:58 +00:00
Tom Christie
23fa6e54ce
Escape \u2028 and \u2029 in JSON output.
...
Closes #2169 .
2014-12-03 22:33:34 +00:00
José Padilla
7f9dc73672
Remove XML support from core
2014-11-29 14:57:51 -04:00
José Padilla
fe745b9616
Remove JSONP support from core
2014-11-29 14:55:33 -04:00
José Padilla
731c8421af
Remove YAML support from core
2014-11-29 14:43:05 -04:00
Xavier Ordoquy
767414439b
Be nicer with __closable_objects.
2014-11-26 22:20:14 +01:00
Xavier Ordoquy
f5e5ed0077
Merge remote-tracking branch 'reference/master' into bugfix/1850
2014-11-26 16:36:56 +01:00
José Padilla
653d626b3c
Fix failing YAML tests
2014-11-25 11:33:18 -04:00
Xavier Ordoquy
311d315a73
Reverted 59d0a0387d and fixed the tests
2014-10-08 08:33:28 +02:00
Tom Christie
5e39e159ee
UNICODE_JSON and COMPACT_JSON settings
2014-09-12 11:38:22 +01:00
Tom Christie
63d02dbea8
Drop six from compat. 1.4.2 is now the lowest supported version.
2014-08-19 17:06:55 +01:00
Tom Christie
bf09c32de8
Code linting and added runtests.py
2014-08-19 13:28:07 +01:00
Xavier Ordoquy
7b4463f739
Merge remote-tracking branch 'reference/2.4.0' into feature/pytest
...
Conflicts:
rest_framework/runtests/urls.py
tests/test_response.py
tox.ini
2014-05-01 08:01:38 +02:00
Xavier Ordoquy
1797a74e82
Merge remote-tracking branch 'pelme/pytest' into feature/pytest
...
Conflicts:
.travis.yml
rest_framework/runtests/runtests.py
tests/test_filters.py
tests/test_pagination.py
tox.ini
2014-04-17 09:53:44 +02:00
Andreas Pelme
971578ca34
Support for running the test suite with py.test
...
* Get rid of runtests.py
* Moved test code from rest_framework/tests and rest_framework/runtests to tests
* Invoke py.test from setup.py
* Invoke py.test from Travis
* Invoke py.test from tox
* Changed setUpClass to be just plain setUp in test_permissions.py
* Updated contribution guideline to show how to invoke py.test
2014-03-02 12:40:30 +01:00
