PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-07 05:01:29 +00:00
Code Issues Projects Releases Wiki Activity

Simplify config reading/writing. Related #449

Browse Source
This commit is contained in:
dmiller
2016-07-11 13:34:49 +00:00
parent 0ac0d8f505
commit fd5926ed1c
2 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
zenmap/zenmapCore/UmitConfigParser.py
View File

@@ -126,10 +126,9 @@ from zenmapCore.UmitLogging import log
class UmitConfigParser(ConfigParser):
filenames = None
fp = None
def __init__(self, *args):
self.filenames = None
ConfigParser.__init__(self, *args)
def set(self, section, option, value):
@@ -142,31 +141,17 @@ class UmitConfigParser(ConfigParser):
def read(self, filename):
log.debug(">>> Trying to parse: %s" % filename)
self.filenames = ConfigParser.read(self, filename)
return self.filenames
if ConfigParser.read(self, filename):
self.filenames = filename
def readfp(self, fp, filename=None):
ConfigParser.readfp(self, fp, filename)
self.fp = fp
self.filenames = filename
return self.filenames
def save_changes(self):
if self.filenames:
filename = None
if isinstance(self.filenames, basestring):
filename = self.filenames
elif isinstance(self.filenames, list):
if len(self.filenames) == 1:
filename = self.filenames[0]
else:
raise ValueError("UmitConfigParser can't handle a list "
"of filenames: %s" % self.filenames)
else:
raise ValueError("UmitConfigParser can't handle a filename of "
"type %s: %s" % (type(self.filenames), self.filenames))
self.write(open(filename, 'w'))
elif self.fp:
self.write(self.fp)
log.debug("saving to %s" % self.filenames)
self.write(open(self.filenames, 'w'))
else:
log.debug(">>> UmitConfigParser can't save changes: no filename")
def write(self, fp):
'''Write alphabetically sorted config files'''