Merge tag 'upstream/2.5.0'

Upstream version 2.5.0

1 files changed, 8 insertions, 3 deletions

diff --git a/engine/SCons/Variables/__init__.py b/engine/SCons/Variables/__init__.py
index 57447d7..83ec1b2 100644
--- a/engine/SCons/Variables/__init__.py
+++ b/engine/SCons/Variables/__init__.py
@@ -5,7 +5,7 @@ customizable variables to an SCons build.
 """
 
 #
-# Copyright (c) 2001 - 2015 The SCons Foundation
+# Copyright (c) 2001 - 2016 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@ customizable variables to an SCons build.
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-__revision__ = "src/engine/SCons/Variables/__init__.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog"
+__revision__ = "src/engine/SCons/Variables/__init__.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"
 
 import os.path
 import sys
@@ -50,12 +50,17 @@ class Variables(object):
     Holds all the options, updates the environment with the variables,
     and renders the help text.
     """
-    def __init__(self, files=[], args={}, is_global=1):
+    def __init__(self, files=None, args=None, is_global=1):
         """
         files - [optional] List of option configuration files to load
             (backward compatibility) If a single string is passed it is
                                      automatically placed in a file list
         """
+        # initialize arguments
+        if files is None:
+            files = []
+        if args is None:
+            args = {}
         self.options = []
         self.args = args
         if not SCons.Util.is_List(files):