Stylistic improvements.

This commit is contained in:
Soren Hansen
2010-08-18 00:05:06 +02:00
parent f489dc055d
commit 4291ff7e86
2 changed files with 5 additions and 3 deletions

View File

@@ -153,8 +153,6 @@ DEFINE_spaceseplist = _wrapper(gflags.DEFINE_spaceseplist)
DEFINE_multistring = _wrapper(gflags.DEFINE_multistring) DEFINE_multistring = _wrapper(gflags.DEFINE_multistring)
DEFINE_multi_int = _wrapper(gflags.DEFINE_multi_int) DEFINE_multi_int = _wrapper(gflags.DEFINE_multi_int)
ArgumentSerializer = gflags.ArgumentSerializer
def DECLARE(name, module_string, flag_values=FLAGS): def DECLARE(name, module_string, flag_values=FLAGS):
if module_string not in sys.modules: if module_string not in sys.modules:

View File

@@ -21,6 +21,7 @@ Twisted daemon helpers, specifically to parse out gFlags from twisted flags,
manage pid files and support syslogging. manage pid files and support syslogging.
""" """
import gflags
import logging import logging
import os import os
import signal import signal
@@ -48,6 +49,7 @@ class TwistdServerOptions(ServerOptions):
def parseArgs(self, *args): def parseArgs(self, *args):
return return
class FlagParser(object): class FlagParser(object):
def __init__(self, parser): def __init__(self, parser):
self.parser = parser self.parser = parser
@@ -87,7 +89,9 @@ def WrapTwistedOptions(wrapped):
for param in twistd_params: for param in twistd_params:
key = param[0].replace('-', '_') key = param[0].replace('-', '_')
if len(param) > 4: if len(param) > 4:
flags.DEFINE(FlagParser(param[4]), key, param[2], str(param[3]), serializer=flags.ArgumentSerializer()) flags.DEFINE(FlagParser(param[4]),
key, param[2], str(param[3]),
serializer=gflags.ArgumentSerializer())
else: else:
flags.DEFINE_string(key, param[2], str(param[3])) flags.DEFINE_string(key, param[2], str(param[3]))