Refactoring

buildutil/iniparser.py

@@ -39,27 +39,17 @@ def read(self, section, key):
 		ini.read(self.iniPathFile)
 
 		# Validate
-		if section == "":
-			section = "DEFAULT"
-
-		if section is None:
+		if section == "" or section is None:
 			section = "DEFAULT"
 
-		if key == "" or key is None:
-			return
-
-
 		if key == "" or key is None:
 			return
 
 		# Get configuration
 		rv = None
 		try:
-			rv = ini[section][key]
-			#rv = ini.get(section, key)
+			rv = ini.get(section, key)
 		except Exception as e:
-			#raise(e)
-			#print(f"{section} {key}")
 			rv = None
 
 
@@ -68,8 +58,6 @@ def read(self, section, key):
 			rv = True
 		elif rv == "False":
 			rv = False
-		#elif rv == "None":
-		#	rv = None
 		else:
 			try:
 				return int(rv)
@@ -92,10 +80,7 @@ def write(self, section, key, value, update=True):
 		ini.read(self.iniPathFile)
 
 		# Validate
-		if section == "":
-			section = "DEFAULT"
-
-		if section is None:
+		if section == "" or section is None:
 			section = "DEFAULT"
 
 		if key == "" or key is None:
@@ -133,6 +118,7 @@ def write(self, section, key, value, update=True):
 
 		#print(f"Wrote: [{section_key}] = '{value}")
 
+
 	def __str__(self):
 		rv = ""
 		try:
@@ -187,7 +173,7 @@ def main():
 	# Read back
 	rv = parser.read(section, key)
 
-	# Validate 
+	# Validate
 	if rv != value:
 		raise Exception("FAILLURE!!")
 

buildutil/version.py

@@ -1,4 +1,4 @@
-__version__ = "v0.0.1-6"
+__version__ = "v0.0.1-7"
 __author__ = "Kanelis Elias"
 __email__ = "hkanelhs@yahoo.gr"
 __license__ = "MIT"