Skip to content

Commit

Permalink
Removed code smells
Browse files Browse the repository at this point in the history
  • Loading branch information
hlasimpk committed Apr 29, 2017
1 parent 5d58e0c commit 8fd17f4
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions simbad/util/config_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def _get_config_file(self, cmd_file=None):
logger.critical(msg)
raise RuntimeError(msg)

logger.debug("Using configuration file: %", config_file)
logger.debug("Using configuration file: %s", config_file)
return config_file

def _process_options(self):
Expand Down Expand Up @@ -122,7 +122,7 @@ def _process_options(self):

def _preset_options(self, mode):
assert hasattr(self, mode), "Unknown mode: {0}".format(mode)
logger.info("Using preset mode: %", mode)
logger.info("Using preset mode: %s", mode)
for k, v in getattr(self, mode).iteritems():
if 'cmdline_flags' in self.d and k in self.d['cmdline_flags']:
if self.d[k] == v:
Expand All @@ -131,10 +131,10 @@ def _preset_options(self, mode):
msg = 'WARNING! Overriding {0} setting: {1} > {2} with {3}'.format(mode, k, v, self.d[k])
logger.critical(msg)
elif k in self.d:
logger.debug("% overriding default setting: % > % with % ", mode, k, v, self.d[k])
logger.debug("%s overriding default setting: %s -> %s with %s", mode, k, v, self.d[k])
self.d[k] = v
else:
logger.debug("% setting: % > % ", mode, k, v)
logger.debug("%s setting: %s -> %s", mode, k, v)
self.d[k] = v
return

Expand Down Expand Up @@ -198,7 +198,7 @@ def _read_cmdline_opts(self, cmdline_opts):
if k not in self.d:
self.d[k] = v
elif v is not None:
logger.debug("Cmdline setting %: % > % ", k, self.d[k], v)
logger.debug("Cmdline setting %s: %s -> %s", k, self.d[k], v)
self.d[k] = v

self.d['cmdline_flags'] = cmdline_flags
Expand Down Expand Up @@ -229,7 +229,7 @@ def write_config_file(self, config_file=None):
config_file = os.path.join(self.d['work_dir'], self.d['name'] + ".ini")
# Write config to job specific directory
self.d["out_config_file"] = config_file
logger.info("SIMBAD configuration written to: % ", config_file)
logger.info("SIMBAD configuration written to: %s", config_file)
with open(config_file, "w") as out: config.write(out)
return

Expand Down

0 comments on commit 8fd17f4

Please sign in to comment.