Update to SCons 1.2.0.

third_party/scons/scons-local/SCons/Tool/msvs.py

 """SCons.Tool.msvs
 
 Tool-specific initialization for Microsoft Visual Studio project files.
 
 There normally shouldn't be any need to import this module directly.
 It will usually be imported through the generic SCons.Tool.Tool()
 selection method.
 
 """
 
@@ skipping 13 matching lines @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
 # KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
 # WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # 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/Tool/msvs.py 3603 2008/10/10 05:46:45 scons"
+__revision__ = "src/engine/SCons/Tool/msvs.py 3842 2008/12/20 22:59:52 scons"
 
 import base64
-import md5
+import hashlib
 import os.path
 import pickle
 import re
 import string
 import sys
 
 import SCons.Builder
 import SCons.Node.FS
 import SCons.Platform.win32
 import SCons.Script.SConscript
@@ skipping 24 matching lines @@
     s = string.replace(s, '"', """)
     return s
 
 external_makefile_guid = '{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}'
 
 def _generateGUID(slnfile, name):
     """This generates a dummy GUID for the sln file to use.  It is
     based on the MD5 signatures of the sln filename plus the name of
     the project.  It basically just needs to be unique, and not
     change with each invocation."""
+    m = hashlib.md5()
+    m.update(str(slnfile) + str(name))
     # TODO(1.5)
-    #solution = _hexdigest(md5.new(str(slnfile)+str(name)).digest()).upper()
-    solution = string.upper(_hexdigest(md5.new(str(slnfile)+str(name)).digest()))
+    #solution = m.hexdigest().upper()
+    solution = string.upper(_hexdigest(m.digest()))
     # convert most of the signature to GUID form (discard the rest)
     solution = "{" + solution[:8] + "-" + solution[8:12] + "-" + solution[12:16] + "-" + solution[16:20] + "-" + solution[20:32] + "}"
     return solution
 
 version_re = re.compile(r'(\d+\.\d+)(.*)')
 
 def msvs_parse_version(s):
     """
     Split a Visual Studio version, which may in fact be something like
     '7.0Exp', into is version number (returned as a float) and trailing
@@ skipping 1709 matching lines @@
             # The executable is 'devenv' in Visual Studio Pro,
             # Team System and others.  Express Editions have different
             # executable names.  Right now we're only going to worry
             # about Visual C++ 2005 Express Edition.
             return env.Detect('devenv') or env.Detect('vcexpress')
         else:
             return env.Detect('msdev')
     else:
         # there's at least one version of MSVS installed.
         return 1