fix import logic, to hopefully not break this time

svn path=/main/branches/prefix/; revision=9048

diff --git a/bin/archive-conf b/bin/archive-conf
index 9047f3abfe0296ec993ec9d906190547e701e810..4caa1d564590a0ebaa0b37eb9fce222665bd6085 100755 (executable)
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -13,11 +13,12 @@
 import os, sys
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage
 
 import dispatch_conf

diff --git a/bin/chkcontents b/bin/chkcontents
index 1d9d11de71792256267bef48927879d9e53f842e..e38bdedeca3ad8f8ee715081d209d05de67fcf98 100755 (executable)
--- a/bin/chkcontents
+++ b/bin/chkcontents
@@ -11,11 +11,12 @@
 import os.path, os, sys
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage
 
 def CONTENTScheck(path):

diff --git a/bin/clean_locks b/bin/clean_locks
index 9d7c1986a0b8c210047b31048dea946ce040e4f2..bae8a975901d26c56bd4c49f756b24a7694d8268 100755 (executable)
--- a/bin/clean_locks
+++ b/bin/clean_locks
@@ -6,11 +6,12 @@
 import os,sys,errno
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage.locks
 
 from portage.const import EPREFIX

diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 557c937fc0bf03d43f6ef2d28d87739c0a870a94..c08cd56c6760e575c2e76931d1dce4906f1d3292 100755 (executable)
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -20,11 +20,12 @@ from random import *
 import atexit, commands, os, re, shutil, stat, sys
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage
 
 from portage import dispatch_conf, const

diff --git a/bin/ebuild b/bin/ebuild
index 9c4d69652768ac529d3fa6ab7ede7174bbc9c55a..4db0f462e79ec8cd3e8c297f21b6873d59a5e65a 100755 (executable)
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -27,11 +27,12 @@ if "merge" in pargs:
 os.environ["PORTAGE_CALLER"]="ebuild"
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage
 
 import portage.util, portage.const

diff --git a/bin/emaint b/bin/emaint
index d333f56796f4960dc978d4f6a6fa0029085f816c..38a13b87e3f05580348d28b1e511ac6f76e749c2 100755 (executable)
--- a/bin/emaint
+++ b/bin/emaint
@@ -5,11 +5,12 @@ from optparse import OptionParser, OptionValueError
 import re
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage
 
 import portage.const, portage.exception, portage.output

diff --git a/bin/emerge b/bin/emerge
index 60cf94d83e082f0789b6821e34754d75e79fe7bb..16ca57d29510de4cbe62e57310a263e0051f5c6b 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -5,11 +5,12 @@
 
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import _emerge
 
 if __name__ == "__main__":

diff --git a/bin/env-update b/bin/env-update
index 8af3b0886178414730aa0b8cc718c0bface8664b..53019b2fbedf69772f112865a8b110727be01569 100755 (executable)
--- a/bin/env-update
+++ b/bin/env-update
@@ -24,11 +24,12 @@ if len(sys.argv) > 1:
        usage(1)
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage
 
 try:

diff --git a/bin/fix-db.py b/bin/fix-db.py
index ba44a0a169ea442ae86206e1efcd8790517648a1..5829412eb556356d572c4cba0f6c4117d86416bd 100755 (executable)
--- a/bin/fix-db.py
+++ b/bin/fix-db.py
@@ -6,11 +6,12 @@
 import os,sys,re
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage
 
 from stat import *

diff --git a/bin/fixpackages b/bin/fixpackages
index dc6e75c4d903fcbb89369ec8e599efe54aa86169..756da6126cd0bc147ac0b2ffcc9a1daaaad51367 100755 (executable)
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -7,11 +7,12 @@ import os,sys
 os.environ["PORTAGE_CALLER"]="fixpackages"
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage
 
 mysettings = portage.settings

diff --git a/bin/glsa-check b/bin/glsa-check
index 892851f75f3d91d2a2ff0daf103eec3d605b16ff..cdd1db304a38f9eefabe0c0ec493668ebc7df074 100644 (file)
--- a/bin/glsa-check
+++ b/bin/glsa-check
@@ -7,11 +7,12 @@ import os
 import sys
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage
 
 from portage.output import *

diff --git a/bin/md5check.py b/bin/md5check.py
index 57de9594783142168db9d91966195cbb5f5b6214..39941a253bc85563508b2ab8c52134787847a28b 100755 (executable)
--- a/bin/md5check.py
+++ b/bin/md5check.py
@@ -7,11 +7,12 @@ import os,sys
 os.environ["FEATURES"]="mirror cvs"
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage
 
 import portage.util

diff --git a/bin/pkgname b/bin/pkgname
index d7482f4bf87dae230ed86b8c6f355167cee8a903..41ae9f13d71a20af5475362bb3cea5d0ecb9a61c 100755 (executable)
--- a/bin/pkgname
+++ b/bin/pkgname
@@ -6,11 +6,12 @@
 import sys, os
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage
 
 a=portage.pkgsplit(sys.argv[1])

diff --git a/bin/portageq b/bin/portageq
index 7c339a349d408e77ff160e605639c0a070f3be12..23de667b3a7d2ea8352f119a8edbf8bb6739ceb9 100755 (executable)
--- a/bin/portageq
+++ b/bin/portageq
@@ -475,11 +475,12 @@ def main():
        os.environ["PORTAGE_LEGACY_GLOBALS"] = "false"
 
        # for an explanation on this logic, see pym/_emerge/__init__.py
-       from os import path as osp
-       if os.environ.contains("PORTAGE_PYTHONPATH"):
+       import os
+       import sys
+       if os.environ.__contains__("PORTAGE_PYTHONPATH"):
                sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
        else:
-               sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+               sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
        import portage
 
        del os.environ["PORTAGE_LEGACY_GLOBALS"]

diff --git a/bin/quickpkg b/bin/quickpkg
index 0d8e0faedb272bbbc6fb4eb3fafe338a8f095df2..08332cc4d3616897f651372b5f7184d0d5aa2e04 100755 (executable)
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -6,11 +6,12 @@
 import errno, signal, sys, os
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 
 def quickpkg_main(options, args, eout):
        from portage import catsplit, dep_expand, flatten, isvalidatom, xpak

diff --git a/bin/regenworld b/bin/regenworld
index 04d4e6edeba43a359f4e37a41d743df0fbdb6887..369d7faba6c5bb280ccfbc16a44e02b6840ffc02 100755 (executable)
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -6,11 +6,12 @@
 import sys, os
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage
 
 import re, portage.const

diff --git a/bin/repoman b/bin/repoman
index f535a3034b2521fba24b9100cd33ec7e355f512d..1106246a11da20262fb7b9e660118f7e979bb3a2 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -43,11 +43,12 @@ if not hasattr(__builtins__, "set"):
 os.environ["PORTAGE_LEGACY_GLOBALS"] = "false"
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage
 
 del os.environ["PORTAGE_LEGACY_GLOBALS"]

diff --git a/bin/xpak b/bin/xpak
index 2a945a84ca3d6b2db67f8c7c8a462c6f7f190744..0a714fa8f25e2054e6a80f3cb7250447f242e03a 100755 (executable)
--- a/bin/xpak
+++ b/bin/xpak
@@ -9,11 +9,12 @@ if len(sys.argv)!=3:
        sys.exit(1)
 
 # for an explanation on this logic, see pym/_emerge/__init__.py
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage.xpak
 
 portage.xpak.xpak(sys.argv[1],sys.argv[2])

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 5070b5ea638356d1f7d265edcc73e6bc5b19db60..c8c852bcb60455a76e1197a6e96f2d2ab9943f13 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -35,11 +35,12 @@ os.environ["PORTAGE_LEGACY_GLOBALS"] = "false"
 # Portage using another Prefix instance on the same system.  For this
 # reason we ignore the entire search path, and allow a backdoor for
 # developers via the PORTAGE_PYTHONPATH variable.
-from os import path as osp
-if os.environ.contains("PORTAGE_PYTHONPATH"):
+import os
+import sys
+if os.environ.__contains__("PORTAGE_PYTHONPATH"):
        sys.path.insert(0, os.environ["PORTAGE_PYTHONPATH"])
 else:
-       sys.path.insert(0, osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), "pym"))
+       sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym"))
 import portage
 
 del os.environ["PORTAGE_LEGACY_GLOBALS"]