From 4291ff7e8619ab115a5614bd5047b0feaefe2fa9 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren.hansen@rackspace.com>
Date: Wed, 18 Aug 2010 00:05:06 +0200
Subject: [PATCH] Stylistic improvements.

---
 nova/flags.py  | 2 --
 nova/twistd.py | 6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nova/flags.py b/nova/flags.py
index e0181102..6f9f906d 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 a72cc85e..9511c231 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]))