From e8c33d83cb6f78368229c1b98abd31449e5d5d77 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Sat, 15 May 2010 00:59:33 +0000 Subject: Convert old-style classes in Subst.py to new-style classes. --- src/engine/SCons/Subst.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/engine/SCons/Subst.py b/src/engine/SCons/Subst.py index be52772..98097dc 100644 --- a/src/engine/SCons/Subst.py +++ b/src/engine/SCons/Subst.py @@ -58,7 +58,7 @@ def raise_exception(exception, target, s): -class Literal: +class Literal(object): """A wrapper for a string. If you use this object wrapped around a string, then it will be interpreted as literal. When passed to the command interpreter, all special @@ -78,7 +78,7 @@ class Literal: def is_literal(self): return 1 -class SpecialAttrWrapper: +class SpecialAttrWrapper(object): """This is a wrapper for what we call a 'Node special attribute.' This is any of the attributes of a Node that we can reference from Environment variable substitution, such as $TARGET.abspath or @@ -160,7 +160,7 @@ def escape_list(mylist, escape_func): return e(escape_func) return list(map(escape, mylist)) -class NLWrapper: +class NLWrapper(object): """A wrapper class that delays turning a list of sources or targets into a NodeList until it's needed. The specified function supplied when the object is initialized is responsible for turning raw nodes @@ -221,7 +221,7 @@ class Targets_or_Sources(collections.UserList): nl = self.nl._create_nodelist() return repr(nl) -class Target_or_Source: +class Target_or_Source(object): """A class that implements $TARGET or $SOURCE expansions by in turn wrapping a NLWrapper. This class handles the different methods used to access an individual proxy Node, calling the NLWrapper to create @@ -395,7 +395,7 @@ def scons_subst(strSubst, env, mode=SUBST_RAW, target=None, source=None, gvars={ if isinstance(strSubst, str) and strSubst.find('$') < 0: return strSubst - class StringSubber: + class StringSubber(object): """A class to construct the results of a scons_subst() call. This binds a specific construction environment, mode, target and -- cgit v0.12