1. Jesper Noehr
  2. django-piston
  3. Pull requests

Pull requests

#35 Open
Repository
rmagee
Branch
default
Repository
jespern
Branch
default

Added import json as simplejson to avoid the Django 1.5 incompatibility with simplejson 2.2

Bitbucket cannot automatically merge this request.

The commits that make up this pull request have been removed.

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update 
hg pull -r default https://bitbucket.org/rmagee/django-piston
Author
  1. Robert Magee
Reviewers
Description

Changed the import for simplejson to "import json as simplejson". I don't know of a better way around this- looks like the django group will be throwing out simplejson anyway. This patch will fix the issue at the import at least. You'll probably want to refactor the code to be more explicit (get rid of the simplejson references)...anyway, here you go.

  • Learn about pull requests

Comments (1)