Fix leftover SCons.Util references. (Ralf W. Grosse-Kunstleve and Patrick Mezard)

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1348 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 4846e44159e6649e57c28d648d1c0e8f5084971d..3c657433f503985ce6c88bfed42e44649430f34b 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -86,6 +86,11 @@ RELEASE 0.97 - XXX
     check for the build engine in the parent directory of the Python
     library directory (/usr/lib64 instead of /usr/lib).
 
+  From Ralph W. Grosse-Kunstleve and Patrick Mezard:
+
+  - Remove unneceesary (and incorrect) SCons.Util strings on some function
+    calls in SCons.Util.
+
   From Stephen Kennedy:
 
   - Speed up writing the .sconsign file at the end of a run by only

diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index 90e5393d4be3b10047d8bb2802a045205d3ff44b..958b8c7f0dfe78ae349eb46a92c91dcc3c02a67d 100644 (file)
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -506,8 +506,8 @@ if can_read_reg:
         p = key.rfind('\\') + 1
         keyp = key[:p]
         val = key[p:]
-        k = SCons.Util.RegOpenKeyEx(root, keyp)
-        return SCons.Util.RegQueryValueEx(k,val)
+        k = RegOpenKeyEx(root, keyp)
+        return RegQueryValueEx(k,val)
 
 if sys.platform == 'win32':