[Boost-commit] svn:boost r75546 - in trunk/tools/build/v2: . build tools

Subject: [Boost-commit] svn:boost r75546 - in trunk/tools/build/v2: . build tools
From: ghost_at_[hidden]
Date: 2011-11-18 14:09:13

Author: vladimir_prus
Date: 2011-11-18 14:09:12 EST (Fri, 18 Nov 2011)
New Revision: 75546
URL: http://svn.boost.org/trac/boost/changeset/75546

Log:
Fix syntax error in Boost.Build/Python.

Patch from Juraj Ivančić.

Text files modified: 
   trunk/tools/build/v2/build/type.py   |     2 +-                                      
   trunk/tools/build/v2/build_system.py |     2 +-                                      
   trunk/tools/build/v2/tools/common.py |    10 +++++-----                              
   3 files changed, 7 insertions(+), 7 deletions(-)

Modified: trunk/tools/build/v2/build/type.py
==============================================================================
--- trunk/tools/build/v2/build/type.py	(original)
+++ trunk/tools/build/v2/build/type.py	2011-11-18 14:09:12 EST (Fri, 18 Nov 2011)
@@ -81,7 +81,7 @@
     __types [type] = entry
     
     if base_type:
-        __types [base_type]['derived'].append (type)
+        __types.setdefault(base_type, {}).setdefault('derived', []).append(type)
 
     if len (suffixes) > 0:
         # Generated targets of 'type' will use the first of 'suffixes'

Modified: trunk/tools/build/v2/build_system.py
==============================================================================
--- trunk/tools/build/v2/build_system.py	(original)
+++ trunk/tools/build/v2/build_system.py	2011-11-18 14:09:12 EST (Fri, 18 Nov 2011)
@@ -524,7 +524,7 @@
         print "warning: For more configuration options, please consult"
         print "warning: http://boost.org/boost-build2/doc/html/bbv2/advanced/configuration.html"
 
-        toolset.using(dt, dtv)
+        using(dt, dtv)
 
     # Parse command line for targets and properties. Note that this requires
     # that all project files already be loaded.

Modified: trunk/tools/build/v2/tools/common.py
==============================================================================
--- trunk/tools/build/v2/tools/common.py	(original)
+++ trunk/tools/build/v2/tools/common.py	2011-11-18 14:09:12 EST (Fri, 18 Nov 2011)
@@ -53,7 +53,7 @@
     if OS == "NT":
         # On Windows the case and capitalization of PATH is not always predictable, so
         # let's find out what variable name was really set.
-        for n in sys.environ:
+        for n in os.environ:
             if n.lower() == "path":
                 __executable_path_variable = n
                 break
@@ -99,7 +99,7 @@
     def __init__(self):
         self.used_ = set()
         self.all_ = set()
-        self.params = {}
+        self.params_ = {}
 
     def register(self, id):
         """
@@ -113,7 +113,7 @@
             errors.error("common: the configuration '$(id)' is in use")
 
         if id not in self.all_:
-            self.all_ += [id]
+            self.all_.add(id)
 
             # Indicate that a new configuration has been added.
             return True
@@ -133,7 +133,7 @@
             errors.error("common: the configuration '$(id)' is not known")
 
         if id not in self.used_:
-            self.used_ += [id]
+            self.used_.add(id)
 
             # indicate that the configuration has been marked as 'used'
             return True
@@ -150,7 +150,7 @@
 
     def get(self, id, param):
         """ Returns the value of a configuration parameter. """
-        self.params_.getdefault(param, {}).getdefault(id, None)
+        self.params_.get(param, {}).get(id)
 
     def set (self, id, param, value):
         """ Sets the value of a configuration parameter. """