Merge branch 'fix-prior-saving' into 'master'

make prior class not get overwritten

See merge request !739

bilby/core/result.py

@@ -20,7 +20,7 @@ from . import utils
 from .utils import (logger, infer_parameters_from_function,
                     check_directory_exists_and_if_not_mkdir,)
 from .utils import BilbyJsonEncoder, decode_bilby_json
-from .prior import Prior, PriorDict, DeltaFunction, ConditionalPriorDict
+from .prior import Prior, PriorDict, DeltaFunction
 
 
 def result_file_name(outdir, label, extension='json', gzip=False):
@@ -299,7 +299,7 @@ class Result(object):
     @priors.setter
     def priors(self, priors):
         if isinstance(priors, dict):
-            if isinstance(priors, ConditionalPriorDict):
+            if isinstance(priors, PriorDict):
                 self._priors = priors
             else:
                 self._priors = PriorDict(priors)