Imported Upstream version 2.5.0upstream/2.5.0

1 files changed, 4 insertions, 8 deletions

diff --git a/engine/SCons/Tool/MSCommon/vs.py b/engine/SCons/Tool/MSCommon/vs.py
index 86cd3a4..82b989d 100644
--- a/engine/SCons/Tool/MSCommon/vs.py
+++ b/engine/SCons/Tool/MSCommon/vs.py
@@ -1,5 +1,5 @@
 #
-# 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
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/Tool/MSCommon/vs.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog"
+__revision__ = "src/engine/SCons/Tool/MSCommon/vs.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"
 
 __doc__ = """Module to detect Visual Studio and/or Visual C/C++
 """
@@ -52,8 +52,6 @@ class VisualStudio(object):
         self.__dict__.update(kw)
         self._cache = {}
 
-    #
-
     def find_batch_file(self):
         vs_dir = self.get_vs_dir()
         if not vs_dir:
@@ -85,7 +83,7 @@ class VisualStudio(object):
             key = root + key
             try:
                 comps = read_reg(key)
-            except WindowsError, e:
+            except SCons.Util.WinError, e:
                 debug('find_vs_dir_by_reg(): no VS registry key %s' % repr(key))
             else:
                 debug('find_vs_dir_by_reg(): found VS in registry: %s' % comps)
@@ -116,8 +114,6 @@ class VisualStudio(object):
             return None
         return executable
 
-    #
-
     def get_batch_file(self):
         try:
             return self._cache['batch_file']
@@ -471,7 +467,7 @@ def get_default_version(env):
     """Returns the default version string to use for MSVS.
 
     If no version was requested by the user through the MSVS environment
-    variable, query all the available the visual studios through
+    variable, query all the available visual studios through
     get_installed_visual_studios, and take the highest one.
 
     Return