Remove unused flags.Help*Flag
These don't do anything anymore since we just rely on optparse's --help behaviour. Change-Id: I7c74456a06fe924503dcfbcfa4da9fc5c26b8ab0
This commit is contained in:
		@@ -48,9 +48,6 @@ from nova import wsgi
 | 
			
		||||
FLAGS = flags.FLAGS
 | 
			
		||||
flags.DEFINE_integer('ajax_console_idle_timeout', 300,
 | 
			
		||||
                     'Seconds before idle connection destroyed')
 | 
			
		||||
flags.DEFINE_flag(flags.HelpFlag())
 | 
			
		||||
flags.DEFINE_flag(flags.HelpshortFlag())
 | 
			
		||||
flags.DEFINE_flag(flags.HelpXMLFlag())
 | 
			
		||||
 | 
			
		||||
LOG = logging.getLogger('nova.ajax_console_proxy')
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -49,9 +49,6 @@ from nova.api import direct
 | 
			
		||||
FLAGS = flags.FLAGS
 | 
			
		||||
flags.DEFINE_integer('direct_port', 8001, 'Direct API port')
 | 
			
		||||
flags.DEFINE_string('direct_host', '0.0.0.0', 'Direct API host')
 | 
			
		||||
flags.DEFINE_flag(flags.HelpFlag())
 | 
			
		||||
flags.DEFINE_flag(flags.HelpshortFlag())
 | 
			
		||||
flags.DEFINE_flag(flags.HelpXMLFlag())
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# An example of an API that only exposes read-only methods.
 | 
			
		||||
 
 | 
			
		||||
@@ -107,9 +107,6 @@ flags.DECLARE('vpn_start', 'nova.network.manager')
 | 
			
		||||
flags.DECLARE('default_floating_pool', 'nova.network.manager')
 | 
			
		||||
flags.DECLARE('public_interface', 'nova.network.linux_net')
 | 
			
		||||
flags.DECLARE('libvirt_type', 'nova.virt.libvirt.connection')
 | 
			
		||||
flags.DEFINE_flag(flags.HelpFlag())
 | 
			
		||||
flags.DEFINE_flag(flags.HelpshortFlag())
 | 
			
		||||
flags.DEFINE_flag(flags.HelpXMLFlag())
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Decorators for actions
 | 
			
		||||
 
 | 
			
		||||
@@ -226,22 +226,6 @@ def DECLARE(name, module_string, flag_values=FLAGS):
 | 
			
		||||
        raise UnrecognizedFlag('%s not defined by %s' % (name, module_string))
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def DEFINE_flag(flag):
 | 
			
		||||
    pass
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class HelpFlag:
 | 
			
		||||
    pass
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class HelpshortFlag:
 | 
			
		||||
    pass
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class HelpXMLFlag:
 | 
			
		||||
    pass
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def _get_my_ip():
 | 
			
		||||
    """Returns the actual ip of the local machine."""
 | 
			
		||||
    try:
 | 
			
		||||
 
 | 
			
		||||
@@ -384,12 +384,6 @@ def serve(*servers):
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def wait():
 | 
			
		||||
    # After we've loaded up all our dynamic bits, check
 | 
			
		||||
    # whether we should print help
 | 
			
		||||
    flags.DEFINE_flag(flags.HelpFlag())
 | 
			
		||||
    flags.DEFINE_flag(flags.HelpshortFlag())
 | 
			
		||||
    flags.DEFINE_flag(flags.HelpXMLFlag())
 | 
			
		||||
    FLAGS.ParseNewFlags()
 | 
			
		||||
    logging.debug(_('Full set of FLAGS:'))
 | 
			
		||||
    for flag in FLAGS:
 | 
			
		||||
        flag_get = FLAGS.get(flag, None)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user