diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-03-12 12:44:08 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-03-12 12:44:08 +0100 |
| commit | 444e0584735464c3a72733d5bd858abe536454be (patch) | |
| tree | 518e951f0fb1f60dc6c7a4d9d60b03df727fa297 | |
| parent | a9bcb94a0fb121a79164c9dd75e56c61f969e6ae (diff) | |
| download | Chimère-444e0584735464c3a72733d5bd858abe536454be.tar.bz2 Chimère-444e0584735464c3a72733d5bd858abe536454be.zip | |
Correct json error (closes #321)
| -rw-r--r-- | chimere/models.py | 3 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | requirements.txt | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/chimere/models.py b/chimere/models.py index ee4688d..85419dc 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -20,7 +20,8 @@ """ Models description """ -import os, string, json, re +import os, string, re +import simplejson as json import lxml.etree as ElementTree from datetime import datetime, timedelta from subprocess import Popen, PIPE diff --git a/debian/control b/debian/control index 54fb16f..ab3dd24 100644 --- a/debian/control +++ b/debian/control @@ -3,6 +3,7 @@ Version: 2.0 Depends: python-django (>=1.3), python-gdal, python-psycopg2, python-beautifulsoup, python-imaging, libjs-jquery, libjs-jquery-ui, libjs-jquery-ui-theme-base, - postgresql-9.1, postgresql-9.1-postgis, gettext + postgresql-9.1, postgresql-9.1-postgis, gettext, + python-simplejson Recommends: tinymce, gpsbabel Suggests: libjs-jquery-ui-theme-south-street diff --git a/requirements.txt b/requirements.txt index 8b33404..02a8290 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,3 +5,4 @@ pil #GDAL lxml south==0.7.3 +simplejson |