equal
deleted
inserted
replaced
20 |
20 |
21 self.quiet = (self.quiet or quiet) and not verbose and not debug |
21 self.quiet = (self.quiet or quiet) and not verbose and not debug |
22 self.verbose = (self.verbose or verbose) or debug |
22 self.verbose = (self.verbose or verbose) or debug |
23 self.debugflag = (self.debugflag or debug) |
23 self.debugflag = (self.debugflag or debug) |
24 self.interactive = (self.interactive and interactive) |
24 self.interactive = (self.interactive and interactive) |
|
25 |
|
26 def readconfig(self, fp): |
|
27 self.cdata.readfp(fp) |
25 |
28 |
26 def config(self, section, val, default=None): |
29 def config(self, section, val, default=None): |
27 if self.cdata.has_option(section, val): |
30 if self.cdata.has_option(section, val): |
28 return self.cdata.get(section, val) |
31 return self.cdata.get(section, val) |
29 return default |
32 return default |