From 136c60b06611ce78308b8336e5bbc991135e5501 Mon Sep 17 00:00:00 2001 From: Florian Obersteiner Date: Wed, 23 Feb 2022 09:53:04 +0100 Subject: [PATCH] built-in 'vars', readability --- src/icartt/dataset.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/icartt/dataset.py b/src/icartt/dataset.py index 20dc6d9..840bce0 100644 --- a/src/icartt/dataset.py +++ b/src/icartt/dataset.py @@ -433,17 +433,17 @@ class Dataset: :return: dictionary of all variables :rtype: dict of Variable(s) """ - vars = {} # TODO rename - "vars" is a Python built-in - if not self.independentVariable is None: # TODO use "is not None" for readbility - vars[self.independentVariable.shortname] = self.independentVariable - if not self.independentBoundedVariable is None: # TODO use "is not None" for readbility - vars[ + variables = {} + if self.independentVariable is not None: + variables[self.independentVariable.shortname] = self.independentVariable + if self.independentBoundedVariable is not None: + variables[ self.independentBoundedVariable.shortname ] = self.independentBoundedVariable - vars = {**vars, **self.dependentVariables, **self.auxiliaryVariables} + variables = {**variables, **self.dependentVariables, **self.auxiliaryVariables} - return vars + return variables def readHeader(self, splitChar=","): """Read the ICARTT header (from file)""" -- GitLab