Fixing leftover from prior reveiew, plus more lint.

pylib/gyp/MSVSNew.py

-# Copyright (c) 2011 Google Inc. All rights reserved.
+# Copyright (c) 2012 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """New implementation of Visual Studio project generation for SCons."""
 
-import common
 import os
 import random
 
 import gyp.common
 
 # hashlib is supplied as of Python 2.5 as the replacement interface for md5
 # and other secure hashes.  In 2.6, md5 is deprecated.  Import hashlib if
 # available, avoiding a deprecation warning under 2.6.  Import md5 otherwise,
 # preserving 2.4 compatibility.
 try:
@@ skipping 183 matching lines @@
     # to project config.  Should we be able to handle variants being a dict,
     # or add a separate variant_map variable?  If it's a dict, we can't
     # guarantee the order of variants since dict keys aren't ordered.
 
 
     # TODO(rspangler): Automatically write to disk for now; should delay until
     # node-evaluation time.
     self.Write()
 
 
-  def Write(self, writer=common.WriteOnDiff):
+  def Write(self, writer=gyp.common.WriteOnDiff):
     """Writes the solution file to disk.
 
     Raises:
       IndexError: An entry appears multiple times.
     """
     # Walk the entry tree and collect all the folders and projects.
     all_entries = set()
     entries_to_check = self.entries[:]
     while entries_to_check:
       e = entries_to_check.pop(0)
@@ skipping 111 matching lines @@
     for e in all_entries:
       if not isinstance(e, MSVSFolder):
         continue        # Does not apply to projects, only folders
       for subentry in e.entries:
         f.write('\t\t%s = %s\r\n' % (subentry.get_guid(), e.get_guid()))
     f.write('\tEndGlobalSection\r\n')
 
     f.write('EndGlobal\r\n')
 
     f.close()