Updated ModelDescription class to ensure that options data memmber is…

… OrderedDict, not plain dict (ensures unit tests work the same across Python 3.5--3.7).
perwin · Jul 19, 2019 · e1845a9 · e1845a9
1 parent fcd682b
commit e1845a9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/pyimfit/descriptions.py b/pyimfit/descriptions.py
@@ -630,7 +630,7 @@ class ModelDescription(object):
     """
 
     def __init__( self, functionSetsList=None, options={} ):
-        self.options = {}
+        self.options = OrderedDict()
         self.options.update(options)
         self._functionSets = []
         self.nFunctionSets = 0

diff --git a/pyimfit/tests/test_descriptions.py b/pyimfit/tests/test_descriptions.py
@@ -335,11 +335,10 @@ def test_ModelDescription_getStrings(self):
 
     def test_ModelDescription_getStrings_with_options(self):
         modeldesc = ModelDescription.load(CONFIG_EXAMPLE_EXPONENTIAL)
-        # use OrderedDict to ensure options are entered in same order on Mac and Linux
+        # use OrderedDict to ensure options are entered in same order across different versions of Python
         optionsDict = OrderedDict()
         optionsDict["GAIN"] = 4.5
         optionsDict["READNOISE"] = 0.9
-#        optionsDict = {"GAIN": 4.5, "READNOISE": 0.9}
         modeldesc.updateOptions(optionsDict)
 
         lines_correct = ["GAIN\t\t4.5\n", "READNOISE\t\t0.9\n", "\n",