From 4abc4f1e35d180cfa97721fc8c39a05c561e6d58 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Tue, 15 Sep 2009 11:40:02 +0200
Subject: [PATCH] Rewrite the lib/cli.py export list
Right now, the export list is a mess, it's not sorted, and the exported
items are in random places. This patches does grow the length of the
list, but at least it's more clear.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/cli.py | 75 ++++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 56 insertions(+), 19 deletions(-)
diff --git a/lib/cli.py b/lib/cli.py
index 7eb05abb4..3841c9b20 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -42,25 +42,62 @@ from optparse import (OptionParser, TitledHelpFormatter,
Option, OptionValueError)
-__all__ = ["DEBUG_OPT", "NOHDR_OPT", "SEP_OPT", "GenericMain",
- "SubmitOpCode", "GetClient",
- "cli_option",
- "GenerateTable", "AskUser",
- "USEUNITS_OPT", "FIELDS_OPT", "FORCE_OPT", "SUBMIT_OPT",
- "ListTags", "AddTags", "RemoveTags", "TAG_SRC_OPT",
- "FormatError", "SplitNodeOption", "SubmitOrSend",
- "JobSubmittedException", "FormatTimestamp", "ParseTimespec",
- "ToStderr", "ToStdout", "UsesRPC",
- "GetOnlineNodes", "JobExecutor", "SYNC_OPT", "CONFIRM_OPT",
- "ArgJobId", "ArgSuggest", "ArgUnknown", "ArgFile", "ArgCommand",
- "ArgInstance", "ArgNode", "ArgChoice", "ArgHost",
- "ARGS_NONE", "ARGS_ONE_INSTANCE", "ARGS_ONE_NODE",
- "ARGS_MANY_INSTANCES", "ARGS_MANY_NODES",
- "OPT_COMPL_ONE_NODE", "OPT_COMPL_ONE_INSTANCE",
- "OPT_COMPL_MANY_NODES",
- "OPT_COMPL_ONE_OS", "OPT_COMPL_ONE_IALLOCATOR",
- "OPT_COMPL_INST_ADD_NODES",
- ]
+__all__ = [
+ # Command line options
+ "CONFIRM_OPT",
+ "DEBUG_OPT",
+ "FIELDS_OPT",
+ "FORCE_OPT",
+ "NOHDR_OPT",
+ "SEP_OPT",
+ "SUBMIT_OPT",
+ "SYNC_OPT",
+ "TAG_SRC_OPT",
+ "USEUNITS_OPT",
+ # Generic functions for CLI programs
+ "GenericMain",
+ "GetClient",
+ "GetOnlineNodes",
+ "JobExecutor",
+ "JobSubmittedException",
+ "ParseTimespec",
+ "SubmitOpCode",
+ "SubmitOrSend",
+ "UsesRPC",
+ # Formatting functions
+ "ToStderr", "ToStdout",
+ "FormatError",
+ "GenerateTable",
+ "AskUser",
+ "FormatTimestamp",
+ # Tags functions
+ "ListTags",
+ "AddTags",
+ "RemoveTags",
+ # command line options support infrastructure
+ "ARGS_MANY_INSTANCES",
+ "ARGS_MANY_NODES",
+ "ARGS_NONE",
+ "ARGS_ONE_INSTANCE",
+ "ARGS_ONE_NODE",
+ "ArgChoice",
+ "ArgCommand",
+ "ArgFile",
+ "ArgHost",
+ "ArgInstance",
+ "ArgJobId",
+ "ArgNode",
+ "ArgSuggest",
+ "ArgUnknown",
+ "OPT_COMPL_INST_ADD_NODES",
+ "OPT_COMPL_MANY_NODES",
+ "OPT_COMPL_ONE_IALLOCATOR",
+ "OPT_COMPL_ONE_INSTANCE",
+ "OPT_COMPL_ONE_NODE",
+ "OPT_COMPL_ONE_OS",
+ "cli_option",
+ "SplitNodeOption",
+ ]
NO_PREFIX = "no_"
UN_PREFIX = "-"
--
GitLab