Renamed API.bootstrap_from_options() to bootstrap_with_global_options()

3 files changed, 6 insertions, 9 deletions

diff --git a/ipalib/cli.py b/ipalib/cli.py
index c1ad82d52..732e38bbd 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -304,7 +304,7 @@ class CLI(object):
         """
         self.__doing('bootstrap')
         self.parse_globals()
-        self.api.bootstrap_from_options(self.options, context='cli')
+        self.api.bootstrap_with_global_options(self.options, context='cli')
 
     def parse_globals(self):
         """
@@ -318,6 +318,9 @@ class CLI(object):
 
             2. ``CLI.cmd_argv`` - a tuple containing the remainder of
                ``CLI.argv`` after the global options have been consumed.
+
+        The common global options are added using the
+        `util.add_global_options` function.
         """
         self.__doing('parse_globals')
         parser = optparse.OptionParser()
@@ -326,12 +329,6 @@ class CLI(object):
                 help='Prompt for all missing options interactively')
         parser.add_option('-n', dest='interactive', action='store_false',
                 help='Don\'t prompt for any options interactively')
-#        parser.add_option('-c', dest='config_file',
-#                help='Specify different configuration file')
-#        parser.add_option('-e', dest='environment',
-#                help='Specify or override environment variables')
-#        parser.add_option('-v', dest='verbose', action='store_true',
-#                help='Verbose output')
         parser.set_defaults(
             prompt_all=False,
             interactive=True,
diff --git a/ipalib/plugable.py b/ipalib/plugable.py
index ccaf1f159..64a9d8354 100644
--- a/ipalib/plugable.py
+++ b/ipalib/plugable.py
@@ -814,7 +814,7 @@ class API(DictProxy):
             handler.setLevel(logging.INFO)
         log.addHandler(handler)
 
-    def bootstrap_from_options(self, options=None, context=None):
+    def bootstrap_with_global_options(self, options=None, context=None):
         if options is None:
             parser = util.add_global_options()
             (options, args) = parser.parse_args(
diff --git a/lite-xmlrpc.py b/lite-xmlrpc.py
index 26204d92e..702d469da 100755
--- a/lite-xmlrpc.py
+++ b/lite-xmlrpc.py
@@ -144,7 +144,7 @@ class LoggingSimpleXMLRPCRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHa
 
 
 if __name__ == '__main__':
-    api.bootstrap_from_options(context='server')
+    api.bootstrap_with_global_options(context='server')
     api.finalize()
     logger = api.log