diff --git a/openquake/db/models.py b/openquake/db/models.py
index <HASH>..<HASH> 100644
--- a/openquake/db/models.py
+++ b/openquake/db/models.py
@@ -28,14 +28,9 @@ Model representations of the OpenQuake DB tables.
 
 import os
 try:
-    import simplejson as json
-except ImportError:
-    import json
-try:
     import cPickle as pickle
 except ImportError:
     import pickle
-
 from collections import namedtuple
 from datetime import datetime
 
diff --git a/openquake/input/source.py b/openquake/input/source.py
index <HASH>..<HASH> 100644
--- a/openquake/input/source.py
+++ b/openquake/input/source.py
@@ -349,6 +349,7 @@ class SourceDBWriter(object):
                 src, self.mesh_spacing, self.bin_width, self.area_src_disc
             )
             geom = nhlib_src.get_rupture_enclosing_polygon()
+
             ps = models.ParsedSource(
                 input=self.inp, source_type=_source_type(src), nrml=src,
                 polygon=geom.wkt
added PickleField, ParsedSource now uses it instead of base<I> and TEXT

Conflicts:

	openquake/db/models.py


Former-commit-id: <I>b<I>dcfe<I>e<I>a<I>d7ba4d3cfe<I>dc3