Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

S

simplejson
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

bc00ddd724e1

Commit bc00ddd724e1 authored 13 years ago by Bob Ippolito

Downloads
- Plain Diff

Merge branch 'item_sort_key'

parents 4dc83c109229 2f8346b924ac

No related branches found

No related tags found

No related merge requests found

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

CHANGES.txt 5 additions, 0 deletions

CHANGES.txt
conf.py 2 additions, 2 deletions

conf.py
index.rst 53 additions, 16 deletions

index.rst
setup.py 1 addition, 1 deletion

setup.py
simplejson/__init__.py 37 additions, 8 deletions

simplejson/__init__.py
simplejson/_speedups.c 19 additions, 5 deletions

simplejson/_speedups.c
simplejson/encoder.py 16 additions, 5 deletions

simplejson/encoder.py
simplejson/tests/test_item_sort_key.py 20 additions, 0 deletions

simplejson/tests/test_item_sort_key.py

with 153 additions and 37 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment