From: Chris Larson <chris_larson@mentor.com>
Date: Mon, 23 Aug 2010 21:00:04 +0000 (-0400)
Subject: Revert "base: use a variable for the modules to import/inject"
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a11eb71464b263412243dd3dd3e0cb2bbf6332f;p=openembedded.git

Revert "base: use a variable for the modules to import/inject"

This reverts commit 5678affd4e1b6453d6802b8cfb7823fec6f47269.
---

diff --git a/classes/base.bbclass b/classes/base.bbclass
index ef9921d04c..89f983f548 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -9,26 +9,31 @@ inherit utils
 inherit utility-tasks
 inherit metadata_scm
 
-OE_IMPORTS += "oe.path oe.utils sys os time"
-
-python oe_import () {
+python sys_path_eh () {
     if isinstance(e, bb.event.ConfigParsed):
+        import sys
+        import os
+        import time
+
         bbpath = e.data.getVar("BBPATH", True).split(":")
         sys.path[0:0] = [os.path.join(dir, "lib") for dir in bbpath]
 
         def inject(name, value):
-            """Make a python object accessible from the metadata"""
+            """Make a python object accessible from everywhere for the metadata"""
             if hasattr(bb.utils, "_context"):
                 bb.utils._context[name] = value
             else:
                 __builtins__[name] = value
 
-        for toimport in e.data.getVar("OE_IMPORTS", True).split():
-            imported = __import__(toimport)
-            inject(toimport, imported)
+        import oe.path
+        import oe.utils
+        inject("bb", bb)
+        inject("sys", sys)
+        inject("time", time)
+        inject("oe", oe)
 }
 
-addhandler oe_import
+addhandler sys_path_eh
 
 die() {
 	oefatal "$*"