Add support for new-style imports while keeping support for old imports as a fallback

svn path=/; revision=382

diff --git a/trunk/src/dep-clean/dep-clean b/trunk/src/dep-clean/dep-clean
index b64edb900e536721b0946c1594386522a020ef4c..2f2bde07f9e771690bf4ed664f45a5b6eac80716 100644 (file)
--- a/trunk/src/dep-clean/dep-clean
+++ b/trunk/src/dep-clean/dep-clean
@@ -7,7 +7,10 @@
 
 import sys
 import gentoolkit
-from output import *
+try:
+       from portage.output import *
+except ImportError:
+       from output import *
 
 __author__      = "Karl Trygve Kalleberg, Brandon Low, Jerry Haltom"
 __email__       = "karltk@gentoo.org, lostlogic@gentoo.org, ssrit@larvalstage"

diff --git a/trunk/src/eclean/eclean b/trunk/src/eclean/eclean
index 5c5f117d6ac57b12046c1eed52a68dc0e9c29d71..00be5e9bb4c447e76330afe051185d63b11ecc2a 100644 (file)
--- a/trunk/src/eclean/eclean
+++ b/trunk/src/eclean/eclean
@@ -24,7 +24,10 @@ import fpformat
 import signal
 sys.path.insert(0,'/usr/lib/portage/pym')
 import portage
-from output import *
+try:
+       from portage.output import *
+except ImportError:
+       from output import *
 
 listdir = portage.listdir
 

diff --git a/trunk/src/epkgmove/epkgmove b/trunk/src/epkgmove/epkgmove
index 8ce0ae0455ebd18566f3905fda2b2ed46520500c..42b6e7d4201abdfc7cfc27b478abbe9167790a14 100644 (file)
--- a/trunk/src/epkgmove/epkgmove
+++ b/trunk/src/epkgmove/epkgmove
@@ -17,7 +17,10 @@ from random import randint
 from optparse import OptionParser
 
 import portage
-from output import *
+try:
+       from portage.output import *
+except ImportError:
+       from output import *
 
 __author__     =       "Ian Leitch"
 __email__      =       "port001@gentoo.org"

diff --git a/trunk/src/etcat/etcat b/trunk/src/etcat/etcat
index 3ffa35dbbaf31ada5b8a2ef97e72e91e20873334..513768361b26c6ecf799d5f046a83e3a5566622b 100755 (executable)
--- a/trunk/src/etcat/etcat
+++ b/trunk/src/etcat/etcat
@@ -93,7 +93,10 @@ sys.path.insert(0, "/usr/lib/gentoolkit/pym")
 
 import gentoolkit
 from stat import *
-from output import *
+try:
+       from portage.output import *
+except ImportError:
+       from output import *
 
 __author__ = "Alastair Tse"
 __email__ = "liquidx@gentoo.org"

diff --git a/trunk/src/genpkgindex/genpkgindex b/trunk/src/genpkgindex/genpkgindex
index ffbc6c229d15bb1d10204dcae479bfe72b703568..2259fb9474ea58247a31f01a21b641c5ad39fd56 100644 (file)
--- a/trunk/src/genpkgindex/genpkgindex
+++ b/trunk/src/genpkgindex/genpkgindex
@@ -12,12 +12,20 @@ if getattr(__builtins__, "set", None) is None:
 for x in ['CFLAGS','CXXFLAGS', 'LDFLAGS','USE']:
        os.environ[x]=''
 
-import xpak
 import portage
-import portage_checksum
-import portage_dep
-import portage_util
-import portage_const
+
+try:
+       import portage.xpak as xpak
+       import portage.checksum as portage_checksum
+       import portage.dep as portage_dep
+       import portage.util as portage_util
+       import portage.const as portage_const
+except ImportError:
+       import xpak
+       import portage_checksum
+       import portage_dep
+       import portage_util
+       import portage_const
 
 argc=len(sys.argv)
 

diff --git a/trunk/src/gensync/gensync b/trunk/src/gensync/gensync
index 493ccb8cf6f60af1254d5984a97cf8076469a673..52f25ed9255c0faeb1d9dbb77384e25bd6d72555 100755 (executable)
--- a/trunk/src/gensync/gensync
+++ b/trunk/src/gensync/gensync
@@ -22,7 +22,11 @@ import fileinput
 
 sys.path.insert(0, "/usr/lib/portage/pym")
 import portage
-from output import *
+
+try:
+       from portage.output import *
+except ImportError:
+       from output import *
 
 class ConfigDefaults:
        def __init__(self):

diff --git a/trunk/src/gentoolkit/pprinter.py b/trunk/src/gentoolkit/pprinter.py
index 66a45f22877bd139a185ba3171b99fb50030512f..255c6d8eeb65712d711f45e78767ffa0df8aad00 100644 (file)
--- a/trunk/src/gentoolkit/pprinter.py
+++ b/trunk/src/gentoolkit/pprinter.py
@@ -6,9 +6,14 @@
 #
 # $Header$
 
-import gentoolkit
-import output
 import sys
+import gentoolkit
+
+try:
+       import portage.output as output
+except ImportError:
+       import output
+
 
 def print_error(s):
        """Prints an error string to stderr."""
@@ -108,4 +113,4 @@ def subsection(s):
        
 def emph(s):
        """Print a string as emphasized."""
-       return output.white(s)
\ No newline at end of file
+       return output.white(s)

diff --git a/trunk/src/glsa-check/glsa-check b/trunk/src/glsa-check/glsa-check
index fedba473197d6c37267539ca75a89cba1639627e..6d2a11b9cbb349ba8db14acbf0543c650143c63c 100644 (file)
--- a/trunk/src/glsa-check/glsa-check
+++ b/trunk/src/glsa-check/glsa-check
@@ -7,7 +7,12 @@ import os
 import sys
 sys.path.insert(0, "/usr/lib/gentoolkit/pym")
 sys.path.insert(0, "/usr/lib/portage/pym")
-from output import *
+
+try:
+       from portage.output import *
+except ImportError:
+       from output import *
+
 from getopt import getopt,GetoptError
 
 __program__ = "glsa-check"