From 94a6156d251f2da12d72d61ea19c6417447b38a2 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sun, 11 Jan 2009 12:39:19 -0600 Subject: [PATCH] Modify global import from catalyst.support to just import what's needed --- ChangeLog | 4 ++++ catalyst | 2 +- modules/catalyst/util.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8412a5c..df66444c 100644 --- 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 catalyst, + modules/catalyst/util.py: + Modify global import from catalyst.support to just import what's needed + 11 Jan 2009; Andrew Gaffney 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 c6acf130..ee8eb83e 100755 --- 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 " diff --git a/modules/catalyst/util.py b/modules/catalyst/util.py index 8b6c63b7..f56d6626 100644 --- 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() -- 2.26.2