fix issue #143. unnecessary list().

This commit is contained in:
benoitc 2011-03-06 10:23:58 +01:00
parent c21578df40
commit dbc61f310e
4 changed files with 8 additions and 8 deletions

View File

@ -60,7 +60,7 @@ class Application(object):
# Load up the any app specific configuration
if cfg:
for k, v in list(cfg.items()):
for k, v in cfg.items():
self.cfg.set(k.lower(), v)
# Load up the config file if its found.
@ -79,7 +79,7 @@ class Application(object):
traceback.print_exc()
sys.exit(1)
for k, v in list(cfg.items()):
for k, v in cfg.items():
# Ignore unknown names
if k not in self.cfg.settings:
continue
@ -91,7 +91,7 @@ class Application(object):
# Lastly, update the configuration with any command line
# settings.
for k, v in list(opts.__dict__.items()):
for k, v in opts.__dict__.items():
if v is None:
continue
self.cfg.set(k.lower(), v)

View File

@ -125,7 +125,7 @@ class DjangoApplicationCommand(Application):
traceback.print_exc()
sys.exit(1)
for k, v in list(cfg.items()):
for k, v in cfg.items():
# Ignore unknown names
if k not in self.cfg.settings:
continue
@ -135,7 +135,7 @@ class DjangoApplicationCommand(Application):
sys.stderr.write("Invalid value for %s: %s\n\n" % (k, v))
raise
for k, v in list(self.options.items()):
for k, v in self.options.items():
if k.lower() in self.cfg.settings and v is not None:
self.cfg.set(k.lower(), v)

View File

@ -110,12 +110,12 @@ class PasterServerApplication(PasterBaseApplication):
cfg["bind"] = bind
if gcfg:
for k, v in list(gcfg.items()):
for k, v in gcfg.items():
cfg[k] = v
cfg["default_proc_name"] = cfg['__file__']
try:
for k, v in list(cfg.items()):
for k, v in cfg.items():
if k.lower() in self.cfg.settings and v is not None:
self.cfg.set(k.lower(), v)
except Exception, e:

View File

@ -373,7 +373,7 @@ class Arbiter(object):
"""\
Kill unused/idle workers
"""
for (pid, worker) in list(self.WORKERS.items()):
for (pid, worker) in self.WORKERS.items():
try:
diff = time.time() - os.fstat(worker.tmp.fileno()).st_ctime
if diff <= self.timeout: