Reduce the imports in stgit/main.py

Some module are only needed when executing a command and not when just
invoking the help. This reduces the delay slightly, useful for stgit bash
completion.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/main.py b/stgit/main.py
index d0e7230ad7933f46006320c81b295c6d1486a0d3..60df5ef9f40789688b65694e092b6c58a68065d8 100644 (file)
--- a/stgit/main.py
+++ b/stgit/main.py
@@ -22,10 +22,6 @@ import sys, os
 from optparse import OptionParser
 
 import stgit.commands
 from optparse import OptionParser
 
 import stgit.commands

-from stgit.stack import Series, StackException
-from stgit.git import GitException
-from stgit.commands.common import CmdException
-from stgit.gitmergeonefile import GitMergeException

 
 #
 # The commands map
 
 #
 # The commands map


@@ -221,6 +217,14 @@ def main():
     usage = command.usage.split('\n')[0].strip()
     parser = OptionParser(usage = usage, option_list = command.options)
     options, args = parser.parse_args()
     usage = command.usage.split('\n')[0].strip()
     parser = OptionParser(usage = usage, option_list = command.options)
     options, args = parser.parse_args()

+
+    # These modules are only used from this point onwards and do not
+    # need to be imported earlier
+    from stgit.stack import Series, StackException
+    from stgit.git import GitException
+    from stgit.commands.common import CmdException
+    from stgit.gitmergeonefile import GitMergeException
+

     try:
         # 'clone' doesn't expect an already initialised GIT tree. A Series
         # object will be created after the GIT tree is cloned
     try:
         # 'clone' doesn't expect an already initialised GIT tree. A Series
         # object will be created after the GIT tree is cloned