Modify global import from catalyst.support to just import what's needed

diff --git a/ChangeLog b/ChangeLog
index e8412a5c11f51320c653a2089f03d2c6fa4a39e8..df66444cbcc03bea74aaa18b3d15eeff3365b616 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst,
+  modules/catalyst/util.py:
+  Modify global import from catalyst.support to just import what's needed
+
   11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst,
   modules/catalyst/support.py, modules/catalyst/util.py:
   Move find_binary() from catalyst.support to catalyst.util

diff --git a/catalyst b/catalyst
index c6acf1308eab6540d270e8842fc1b5e11c1e968d..ee8eb83e8c1089ec8ac42613629a545ac68eb3bf 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -14,7 +14,7 @@ sys.path.append(__selfpath__ + "/modules")
 import catalyst.config
 import catalyst.util
 import catalyst.target
-from catalyst.support import *
+from catalyst.support import hash_map, CatalystError
 from catalyst.output import *
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"

diff --git a/modules/catalyst/util.py b/modules/catalyst/util.py
index 8b6c63b766a6f9fa2b51e8c3a946094dae13328a..f56d6626ad815081aef13139c021b145ce2813e0 100644 (file)
--- a/modules/catalyst/util.py
+++ b/modules/catalyst/util.py
@@ -2,7 +2,7 @@
 Collection of utility functions for catalyst
 """
 
-import sys, traceback
+import sys, traceback, os
 
 def capture_traceback():
        etype, value, tb = sys.exc_info()