p3lib 1.1.84__py3-none-any.whl → 1.1.86__py3-none-any.whl

p3lib/pconfig.py

@@ -474,18 +474,28 @@ class ConfigManager(object):
             #Get the config from the stored config file.
             loadedConfig = self._getDict()
             #Get list of all the keys from the config file loaded.
-            loadedConfigKeys = loadedConfig.keys()
+            loadedConfigKeys = list(loadedConfig.keys())
+
             #Get the default config
-            self._configDict = copy.deepcopy( self._defaultConfig )
-            #Ensure that the config we use has all the values from the file we just loaded and any other values
-            #not in the config file loaded but defined in the default config are set to default values.
-            for key in loadedConfigKeys:
-                if key in self._configDict:
-                    self._configDict[key] = loadedConfig[key]
-                    self._debug("{} = {}".format(key, self._configDict[key]))
-                else:
-                    self._debug("----------> DROPPED FROM CONFIG: {} = {}".format(key, loadedConfig[key]))
+            defaultConfig = copy.deepcopy( self._defaultConfig )
+            defaultConfigKeys = list(defaultConfig.keys())
+
+            # Config parameters may be added or dropped over time. We use the default config to
+            # check for parameters that should be added/removed.
+
+            # Add any missing keys to the loaded config from the default config.
+            for defaultKey in defaultConfigKeys:
+                if defaultKey not in loadedConfigKeys:
+                    loadedConfig[defaultKey] = self._defaultConfig[defaultKey]
+                    self._debug("----------> DEFAULT VALUE ADDED: {} = {}".format(defaultKey, loadedConfig[defaultKey]))
+
+            # If some keys have been dropped from the config, remove them.
+            for loadedConfigKey in loadedConfigKeys:
+                if loadedConfigKey not in defaultConfigKeys:
+                    self._debug("----------> DROPPED FROM CONFIG: {} = {}".format(loadedConfigKey, loadedConfig[loadedConfigKey]))
+                    loadedConfig.pop(loadedConfigKey, None)
 
+        self._configDict = loadedConfig
         self._info("Loaded config from %s" % (self._cfgFile) )
 
     def inputFloat(self, key, prompt, minValue=UNSET_VALUE, maxValue=UNSET_VALUE):

{p3lib-1.1.84.dist-info → p3lib-1.1.86.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.84
+Version: 1.1.86
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/p3lib
 Author: Paul Austen

{p3lib-1.1.84.dist-info → p3lib-1.1.86.dist-info}/RECORD

@@ -11,12 +11,12 @@ p3lib/mqtt_rpc.py,sha256=6LmFA1kR4HSJs9eWbOJORRHNY01L_lHWjvtE2fmY8P8,10511
 p3lib/netif.py,sha256=3QV5OGdHhELIf4MBj6mx5MNCtVeZ7JXoNEkeu4KzCaE,9796
 p3lib/netplotly.py,sha256=PMDx-w1jtRVW6Od5u_kuKbBxNpTS_Y88mMF60puMxLM,9363
 p3lib/ngt.py,sha256=rXA-6zQkfeOupZ-3Q-k3-1DvbKYIi2TCtLKgUb0waWY,37726
-p3lib/pconfig.py,sha256=s6s8HRAXLgDO5hQsIbVP-XgLEhoTQKjwKHrwyJUO4UU,33945
+p3lib/pconfig.py,sha256=g9Qk-tSjxtSuEfLbvIvR1SHC7x7BHxp1evT2IFfk05I,34407
 p3lib/ssh.py,sha256=klqQ9YuqU8GwPVPHrAJeEs5PI5hgoYiXflq2kIGG3as,39509
 p3lib/table_plot.py,sha256=RPncwVlGUkkx5Fw0dHQedXo0TSPlTi__VrJBDzaMsuI,32116
 p3lib/uio.py,sha256=Aaxc99XiE3d2f9vLjaN-bZsckoNxay5t0ujdK6PXGrw,23265
-p3lib-1.1.84.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
-p3lib-1.1.84.dist-info/METADATA,sha256=SLRlR7NXQivWGy6xkcl_ph9ZaP7RRcDPmNoAqrqmzEM,918
-p3lib-1.1.84.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-p3lib-1.1.84.dist-info/top_level.txt,sha256=SDCpXYh-19yCFp4Z8ZK4B-3J4NvTCJElZ42NPgcR6-U,6
-p3lib-1.1.84.dist-info/RECORD,,
+p3lib-1.1.86.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
+p3lib-1.1.86.dist-info/METADATA,sha256=viCrPzOCPwdWFfXg31oL2Q84MpF3bxesV2951yIULjA,918
+p3lib-1.1.86.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+p3lib-1.1.86.dist-info/top_level.txt,sha256=SDCpXYh-19yCFp4Z8ZK4B-3J4NvTCJElZ42NPgcR6-U,6
+p3lib-1.1.86.dist-info/RECORD,,