diff options
| author | Soren Hansen <soren.hansen@rackspace.com> | 2010-08-18 00:05:06 +0200 |
|---|---|---|
| committer | Soren Hansen <soren.hansen@rackspace.com> | 2010-08-18 00:05:06 +0200 |
| commit | 200daa3e5d5571add6c2937cf847641d065e87b8 (patch) | |
| tree | 088ac413164fa7114df8fa7e51f24d1cc12c5be5 | |
| parent | 31c08591793311606551bf0e6bfc14b155b491a6 (diff) | |
| download | nova-200daa3e5d5571add6c2937cf847641d065e87b8.tar.gz nova-200daa3e5d5571add6c2937cf847641d065e87b8.tar.xz nova-200daa3e5d5571add6c2937cf847641d065e87b8.zip | |
Stylistic improvements.
| -rw-r--r-- | nova/flags.py | 2 | ||||
| -rw-r--r-- | nova/twistd.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nova/flags.py b/nova/flags.py index e0181102e..6f9f906dd 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -153,8 +153,6 @@ DEFINE_spaceseplist = _wrapper(gflags.DEFINE_spaceseplist) DEFINE_multistring = _wrapper(gflags.DEFINE_multistring) DEFINE_multi_int = _wrapper(gflags.DEFINE_multi_int) -ArgumentSerializer = gflags.ArgumentSerializer - def DECLARE(name, module_string, flag_values=FLAGS): if module_string not in sys.modules: diff --git a/nova/twistd.py b/nova/twistd.py index a72cc85e6..9511c231c 100644 --- a/nova/twistd.py +++ b/nova/twistd.py @@ -21,6 +21,7 @@ Twisted daemon helpers, specifically to parse out gFlags from twisted flags, manage pid files and support syslogging. """ +import gflags import logging import os import signal @@ -48,6 +49,7 @@ class TwistdServerOptions(ServerOptions): def parseArgs(self, *args): return + class FlagParser(object): def __init__(self, parser): self.parser = parser @@ -87,7 +89,9 @@ def WrapTwistedOptions(wrapped): for param in twistd_params: key = param[0].replace('-', '_') 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: flags.DEFINE_string(key, param[2], str(param[3])) |