django.git/django/core/serializers/json.py, branch archive/attic/sqlalchemy django http://cgit.adnoto.dev/django.git/atom?h=archive%2Fattic%2Fsqlalchemy 2006-09-25T15:39:20Z sqlalchemy: Merged revisions 3770 to 3831 from trunk. 2006-09-25T15:39:20Z Robin Munn robin.munn@gmail.com 2006-09-25T15:39:20Z urn:sha1:1bb4fa2cb66269b1eff3b7d73f8c7864c0622368 git-svn-id: http://code.djangoproject.com/svn/django/branches/sqlalchemy@3832 bcc190cf-cafb-0310-a4f2-bffc1f526a37 Fixed #2607 -- Fixed incorrect ordering of super() arguments in DateTimeAwareJSONEncoder. Thanks for the patch, dummy@habmalnefrage.de 2006-08-28T18:39:30Z Adrian Holovaty adrian@holovaty.com 2006-08-28T18:39:30Z urn:sha1:e7424f0619361873da7a62af0a58a6ba5785f8fa git-svn-id: http://code.djangoproject.com/svn/django/trunk@3671 bcc190cf-cafb-0310-a4f2-bffc1f526a37 Fixed #2460 -- JSON serializer now correctly handles datetime objects. Thanks, siniy and jyrki.pulliainen@gmail.com. 2006-07-31T14:59:53Z Jacob Kaplan-Moss jacob@jacobian.org 2006-07-31T14:59:53Z urn:sha1:2e598fb5718123a98d23638450496ec5a9e54205 git-svn-id: http://code.djangoproject.com/svn/django/trunk@3501 bcc190cf-cafb-0310-a4f2-bffc1f526a37 Added a JSON serializer, a few more tests, and a couple more lines of docs. 2006-06-29T16:42:49Z Jacob Kaplan-Moss jacob@jacobian.org 2006-06-29T16:42:49Z urn:sha1:c9032ab07f3694f3ae7da9b0017b764248ce28c9 git-svn-id: http://code.djangoproject.com/svn/django/trunk@3237 bcc190cf-cafb-0310-a4f2-bffc1f526a37