summaryrefslogtreecommitdiff
path: root/chimere/models.py
diff options
context:
space:
mode:
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
commit444e0584735464c3a72733d5bd858abe536454be (patch)
tree518e951f0fb1f60dc6c7a4d9d60b03df727fa297 /chimere/models.py
parenta9bcb94a0fb121a79164c9dd75e56c61f969e6ae (diff)
downloadChimère-444e0584735464c3a72733d5bd858abe536454be.tar.bz2
Chimère-444e0584735464c3a72733d5bd858abe536454be.zip
Correct json error (closes #321)
Diffstat (limited to 'chimere/models.py')
-rw-r--r--chimere/models.py3
1 files changed, 2 insertions, 1 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