From 340d57481935334465037d97c0db1555b70c0eb1 Mon Sep 17 00:00:00 2001 From: Luca Falavigna Date: Tue, 15 Jun 2010 09:21:32 +0000 Subject: Imported Upstream version 2.0.0 --- engine/SCons/Options/BoolOption.py | 4 ++-- engine/SCons/Options/EnumOption.py | 4 ++-- engine/SCons/Options/ListOption.py | 4 ++-- engine/SCons/Options/PackageOption.py | 4 ++-- engine/SCons/Options/PathOption.py | 16 ++++++++-------- engine/SCons/Options/__init__.py | 19 ++++++------------- 6 files changed, 22 insertions(+), 29 deletions(-) (limited to 'engine/SCons/Options') diff --git a/engine/SCons/Options/BoolOption.py b/engine/SCons/Options/BoolOption.py index f0db8c9..f066a49 100644 --- a/engine/SCons/Options/BoolOption.py +++ b/engine/SCons/Options/BoolOption.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/BoolOption.py 4720 2010/03/24 03:14:11 jars" +__revision__ = "src/engine/SCons/Options/BoolOption.py 5023 2010/06/14 22:05:46 scons" __doc__ = """Place-holder for the old SCons.Options module hierarchy @@ -41,7 +41,7 @@ def BoolOption(*args, **kw): msg = "The BoolOption() function is deprecated; use the BoolVariable() function instead." SCons.Warnings.warn(SCons.Warnings.DeprecatedOptionsWarning, msg) warned = True - return apply(SCons.Variables.BoolVariable, args, kw) + return SCons.Variables.BoolVariable(*args, **kw) # Local Variables: # tab-width:4 diff --git a/engine/SCons/Options/EnumOption.py b/engine/SCons/Options/EnumOption.py index 985cff9..b541108 100644 --- a/engine/SCons/Options/EnumOption.py +++ b/engine/SCons/Options/EnumOption.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/EnumOption.py 4720 2010/03/24 03:14:11 jars" +__revision__ = "src/engine/SCons/Options/EnumOption.py 5023 2010/06/14 22:05:46 scons" __doc__ = """Place-holder for the old SCons.Options module hierarchy @@ -41,7 +41,7 @@ def EnumOption(*args, **kw): msg = "The EnumOption() function is deprecated; use the EnumVariable() function instead." SCons.Warnings.warn(SCons.Warnings.DeprecatedOptionsWarning, msg) warned = True - return apply(SCons.Variables.EnumVariable, args, kw) + return SCons.Variables.EnumVariable(*args, **kw) # Local Variables: # tab-width:4 diff --git a/engine/SCons/Options/ListOption.py b/engine/SCons/Options/ListOption.py index 56c3196..abc98a4 100644 --- a/engine/SCons/Options/ListOption.py +++ b/engine/SCons/Options/ListOption.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/ListOption.py 4720 2010/03/24 03:14:11 jars" +__revision__ = "src/engine/SCons/Options/ListOption.py 5023 2010/06/14 22:05:46 scons" __doc__ = """Place-holder for the old SCons.Options module hierarchy @@ -41,7 +41,7 @@ def ListOption(*args, **kw): msg = "The ListOption() function is deprecated; use the ListVariable() function instead." SCons.Warnings.warn(SCons.Warnings.DeprecatedOptionsWarning, msg) warned = True - return apply(SCons.Variables.ListVariable, args, kw) + return SCons.Variables.ListVariable(*args, **kw) # Local Variables: # tab-width:4 diff --git a/engine/SCons/Options/PackageOption.py b/engine/SCons/Options/PackageOption.py index 597865b..db6cac9 100644 --- a/engine/SCons/Options/PackageOption.py +++ b/engine/SCons/Options/PackageOption.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/PackageOption.py 4720 2010/03/24 03:14:11 jars" +__revision__ = "src/engine/SCons/Options/PackageOption.py 5023 2010/06/14 22:05:46 scons" __doc__ = """Place-holder for the old SCons.Options module hierarchy @@ -41,7 +41,7 @@ def PackageOption(*args, **kw): msg = "The PackageOption() function is deprecated; use the PackageVariable() function instead." SCons.Warnings.warn(SCons.Warnings.DeprecatedOptionsWarning, msg) warned = True - return apply(SCons.Variables.PackageVariable, args, kw) + return SCons.Variables.PackageVariable(*args, **kw) # Local Variables: # tab-width:4 diff --git a/engine/SCons/Options/PathOption.py b/engine/SCons/Options/PathOption.py index 04d56c2..e31960d 100644 --- a/engine/SCons/Options/PathOption.py +++ b/engine/SCons/Options/PathOption.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/PathOption.py 4720 2010/03/24 03:14:11 jars" +__revision__ = "src/engine/SCons/Options/PathOption.py 5023 2010/06/14 22:05:46 scons" __doc__ = """Place-holder for the old SCons.Options module hierarchy @@ -35,7 +35,7 @@ import SCons.Warnings warned = False -class _PathOptionClass: +class _PathOptionClass(object): def warn(self): global warned if not warned: @@ -45,27 +45,27 @@ class _PathOptionClass: def __call__(self, *args, **kw): self.warn() - return apply(SCons.Variables.PathVariable, args, kw) + return SCons.Variables.PathVariable(*args, **kw) def PathAccept(self, *args, **kw): self.warn() - return apply(SCons.Variables.PathVariable.PathAccept, args, kw) + return SCons.Variables.PathVariable.PathAccept(*args, **kw) def PathIsDir(self, *args, **kw): self.warn() - return apply(SCons.Variables.PathVariable.PathIsDir, args, kw) + return SCons.Variables.PathVariable.PathIsDir(*args, **kw) def PathIsDirCreate(self, *args, **kw): self.warn() - return apply(SCons.Variables.PathVariable.PathIsDirCreate, args, kw) + return SCons.Variables.PathVariable.PathIsDirCreate(*args, **kw) def PathIsFile(self, *args, **kw): self.warn() - return apply(SCons.Variables.PathVariable.PathIsFile, args, kw) + return SCons.Variables.PathVariable.PathIsFile(*args, **kw) def PathExists(self, *args, **kw): self.warn() - return apply(SCons.Variables.PathVariable.PathExists, args, kw) + return SCons.Variables.PathVariable.PathExists(*args, **kw) PathOption = _PathOptionClass() diff --git a/engine/SCons/Options/__init__.py b/engine/SCons/Options/__init__.py index b4960b1..63de8ed 100644 --- a/engine/SCons/Options/__init__.py +++ b/engine/SCons/Options/__init__.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/__init__.py 4720 2010/03/24 03:14:11 jars" +__revision__ = "src/engine/SCons/Options/__init__.py 5023 2010/06/14 22:05:46 scons" __doc__ = """Place-holder for the old SCons.Options module hierarchy @@ -48,24 +48,17 @@ class Options(SCons.Variables.Variables): msg = "The Options class is deprecated; use the Variables class instead." SCons.Warnings.warn(SCons.Warnings.DeprecatedOptionsWarning, msg) warned = True - apply(SCons.Variables.Variables.__init__, - (self,) + args, - kw) + SCons.Variables.Variables.__init__(self, *args, **kw) def AddOptions(self, *args, **kw): - return apply(SCons.Variables.Variables.AddVariables, - (self,) + args, - kw) + return SCons.Variables.Variables.AddVariables(self, *args, **kw) def UnknownOptions(self, *args, **kw): - return apply(SCons.Variables.Variables.UnknownVariables, - (self,) + args, - kw) + return SCons.Variables.Variables.UnknownVariables(self, *args, **kw) def FormatOptionHelpText(self, *args, **kw): - return apply(SCons.Variables.Variables.FormatVariableHelpText, - (self,) + args, - kw) + return SCons.Variables.Variables.FormatVariableHelpText(self, *args, + **kw) # Local Variables: # tab-width:4 -- cgit v1.2.3