Use locals() instead of setattr to insert generated functions into the current module...

svn path=/main/trunk/; revision=6241

diff --git a/pym/portage/output.py b/pym/portage/output.py
index 0b58c81b67f87a4145c1cbd665fe1a799b73c40d..386d4c8e518eb3040f97900b5e49626fd35bdb95 100644 (file)
--- a/pym/portage/output.py
+++ b/pym/portage/output.py
@@ -235,7 +235,7 @@ def create_color_func(color_key):
        return derived_func
 
 for c in compat_functions_colors:
-       setattr(sys.modules[__name__], c, create_color_func(c))
+       locals()[c] = create_color_func(c)
 
 class EOutput:
        """

diff --git a/pym/portage/tests/bin/setup_env.py b/pym/portage/tests/bin/setup_env.py
index e0a89f1e29ea3f5b7f1e579c75eeef84306b3c5e..a69a19ec6785a53ff877caa8ebd8ead765b4623f 100644 (file)
--- a/pym/portage/tests/bin/setup_env.py
+++ b/pym/portage/tests/bin/setup_env.py
@@ -66,4 +66,4 @@ for bin in os.listdir(bindir):
           bin.startswith("new") or \
           bin.startswith("prep") or \
           bin in ["ecompress","ecompressdir","fowners","fperms"]:
-               setattr(sys.modules[__name__], bin, create_portage_wrapper(bin))
+               locals()[bin] = create_portage_wrapper(bin)