diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/topics/credits.md | 4 | ||||
| -rw-r--r-- | docs/topics/release-notes.md | 4 | ||||
| -rw-r--r-- | docs/tutorial/1-serialization.md | 7 |
3 files changed, 12 insertions, 3 deletions
diff --git a/docs/topics/credits.md b/docs/topics/credits.md index 60800c9e..b0b00c12 100644 --- a/docs/topics/credits.md +++ b/docs/topics/credits.md @@ -89,6 +89,8 @@ The following people have helped make REST framework great. * Michael Mior - [michaelmior] * Marc Tamlyn - [mjtamlyn] * Richard Wackerbarth - [wackerbarth] +* Johannes Spielmann - [shezi] +* James Cleveland - [radiosilence] Many thanks to everyone who's contributed to the project. @@ -213,3 +215,5 @@ You can also contact [@_tomchristie][twitter] directly on twitter. [michaelmior]: https://github.com/michaelmior [mjtamlyn]: https://github.com/mjtamlyn [wackerbarth]: https://github.com/wackerbarth +[shezi]: https://github.com/shezi +[radiosilence]: https://github.com/radiosilence diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index bf23fa35..f43dc1d3 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -16,6 +16,10 @@ Major version numbers (x.0.0) are reserved for project milestones. No major poi ## 2.1.x series +### Master + +* Support json encoding of timedelta objects. + ### 2.1.16 **Date**: 14th Jan 2013 diff --git a/docs/tutorial/1-serialization.md b/docs/tutorial/1-serialization.md index db6db2da..d3ada9e3 100644 --- a/docs/tutorial/1-serialization.md +++ b/docs/tutorial/1-serialization.md @@ -78,9 +78,10 @@ For the purposes of this tutorial we're going to start by creating a simple `Sni from django.db import models from pygments.lexers import get_all_lexers from pygments.styles import get_all_styles - - LANGUAGE_CHOICES = sorted([(item[1][0], item[0]) for item in get_all_lexers()]) - STYLE_CHOICES = sorted((item, item) for item in list(get_all_styles())) + + LEXERS = [item for item in get_all_lexers() if item[1]] + LANGUAGE_CHOICES = sorted([(item[1][0], item[0]) for item in LEXERS]) + STYLE_CHOICES = sorted((item, item) for item in get_all_styles()) class Snippet(models.Model): |