Remove redundant imports

diff --git a/ChangeLog b/ChangeLog
index bcb679aef8105b6baa16c46aeb50f9b60b6c86dc..8a5059661e3844394950e20c1a3c2773d6e9351d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  12 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
+  modules/catalyst/target/generic_stage.py,
+  modules/catalyst/target/livecd_stage2.py,
+  modules/catalyst/target/stage2.py:
+  Remove redundant imports
+
   12 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst/arch/alpha.py, modules/catalyst/arch/arm.py,
   modules/catalyst/arch/hppa.py, modules/catalyst/arch/ia64.py,

diff --git a/modules/catalyst/target/generic_stage.py b/modules/catalyst/target/generic_stage.py
index 7fff5190dc019ee2db54c90d82d28ce77dd14d87..1ad7cdcb3c3affef9be4be77b430a2454d1a5e39 100644 (file)
--- a/modules/catalyst/target/generic_stage.py
+++ b/modules/catalyst/target/generic_stage.py
@@ -5,13 +5,10 @@ the driver class for pretty much everything that Catalyst does.
 """
 
 import os, string, types, shutil
-from catalyst.target.generic import *
 from stat import *
-import catalyst.lock
-import catalyst.arch
+import catalyst
+from catalyst.target.generic import *
 from catalyst.output import warn
-import catalyst.util
-import catalyst.hash
 from catalyst.error import *
 from catalyst.spawn import *
 

diff --git a/modules/catalyst/target/livecd_stage2.py b/modules/catalyst/target/livecd_stage2.py
index a909afc107dbab19545f77a51ba11a550cad4574..883e7c8e366e93c99883dffad3bda8456e61c16b 100644 (file)
--- a/modules/catalyst/target/livecd_stage2.py
+++ b/modules/catalyst/target/livecd_stage2.py
@@ -5,8 +5,7 @@ Builder class for a LiveCD stage2 build.
 
 import os
 from generic_stage import *
-import catalyst.util
-import catalyst.hash
+import catalyst
 from catalyst.error import *
 from catalyst.spawn import *
 

diff --git a/modules/catalyst/target/stage2.py b/modules/catalyst/target/stage2.py
index 6002427705a638e44125062c77963ec7deba81fe..b2f6507b8aed311fa4f12cce387ed0dfe76099af 100644 (file)
--- a/modules/catalyst/target/stage2.py
+++ b/modules/catalyst/target/stage2.py
@@ -4,8 +4,7 @@ Builder class for a stage2 installation tarball build.
 """
 
 from generic_stage import *
-import catalyst.util
-import catalyst.hash
+import catalyst
 
 class stage2_target(generic_stage_target):
        def __init__(self,spec,addlargs):