Defer sub-command imports until usage

This way, if you're not using those modules, you won't waste time loading them.
eyeonus · Nov 2, 2014 · bb6b8e5 · bb6b8e5
1 parent 2d338d5
commit bb6b8e5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/commands/TEMPLATE.py b/commands/TEMPLATE.py
@@ -1,6 +1,4 @@
-from commands.commandenv import ResultRow
 from commands import MutuallyExclusiveGroup, ParseArgument
-from formatting import RowFormat, ColumnFormat
 
 ######################################################################
 # Parser config
@@ -28,6 +26,7 @@
 # Perform query and populate result set
 
 def run(results, cmdenv, tdb):
+    from commands.commandenv import ResultRow
 
     ### TODO: Implement
 
@@ -37,4 +36,6 @@ def run(results, cmdenv, tdb):
 # Transform result set into output
 
 def render(results, cmdenv, tdb):
+    from formatting import RowFormat, ColumnFormat
+
     ### TODO: Implement
diff --git a/commands/local_cmd.py b/commands/local_cmd.py
@@ -1,6 +1,4 @@
-from commands.commandenv import ResultRow
 from commands import MutuallyExclusiveGroup, ParseArgument
-from formatting import RowFormat, ColumnFormat
 
 ######################################################################
 # Parser config
@@ -78,6 +76,8 @@ def distance(self, star):
 # Perform query and populate result set
 
 def run(results, cmdenv, tdb):
+    from commands.commandenv import ResultRow
+
     cmdenv = results.cmdenv
     tdb = cmdenv.tdb
     srcSystem = cmdenv.nearSystem
@@ -124,6 +124,8 @@ def run(results, cmdenv, tdb):
 # Transform result set into output
 
 def render(results, cmdenv, tdb):
+    from formatting import RowFormat, ColumnFormat
+
     # Compare system names so we can tell 
     longestNamed = max(results.rows,
                     key=lambda row: len(row.system.name()))

diff --git a/commands/nav_cmd.py b/commands/nav_cmd.py
@@ -1,6 +1,4 @@
-from commands.commandenv import ResultRow
 from commands import MutuallyExclusiveGroup, ParseArgument
-from formatting import RowFormat, ColumnFormat
 
 ######################################################################
 # Parser config
@@ -40,6 +38,7 @@
 # Perform query and populate result set
 
 def run(results, cmdenv, tdb):
+    from commands.commandenv import ResultRow
 
     ### TODO: Implement
 
@@ -49,6 +48,8 @@ def run(results, cmdenv, tdb):
 # Transform result set into output
 
 def render(results, cmdenv, tdb):
+    from formatting import RowFormat, ColumnFormat
+
     ### TODO: Implement
 
 def navCommand(tdb, cmdenv):