Stop SVNWrapper and GitWrapper from inheriting from scm.SVN and scm.GIT.

gclient.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A wrapper script to manage a set of client modules in different SCM.
 
 This script is intended to be used to help basic management of client
 program sources residing in one or more Subversion modules and Git
 repositories, along with other modules it depends on, also in Subversion or Git,
@@ skipping 355 matching lines @@
     dir.
 
     Returns:
       A dict representing the contents of the .gclient file or an empty dict if
       the .gclient file doesn't exist.
     """
     if not from_dir:
       from_dir = os.curdir
     path = os.path.realpath(from_dir)
     while not os.path.exists(os.path.join(path, options.config_filename)):
-      next = os.path.split(path)
-      if not next[1]:
+      split_path = os.path.split(path)
+      if not split_path[1]:
         return None
-      path = next[0]
+      path = split_path[0]
     client = GClient(path, options)
     client._LoadConfig()
     return client
 
   def SetDefaultConfig(self, solution_name, solution_url, safesync_url):
     self.SetConfig(DEFAULT_CLIENT_FILE_TEXT % {
       'solution_name': solution_name,
       'solution_url': solution_url,
       'safesync_url' : safesync_url,
     })
@@ skipping 82 matching lines @@
           "darwin": "mac",
           "mac": "mac",
           "unix": "unix",
           "linux": "unix",
           "linux2": "unix",
          }
 
       if self._options.deps_os is not None:
         deps_to_include = self._options.deps_os.split(",")
         if "all" in deps_to_include:
-          deps_to_include = deps_os_choices.values()
+          deps_to_include = list(set(deps_os_choices.itervalues()))

[M-A Ruel, 2010/03/11 15:29:40]

Removes duplicate entries.

       else:
         deps_to_include = [deps_os_choices.get(self._options.platform, "unix")]
 
       deps_to_include = set(deps_to_include)
       for deps_os_key in deps_to_include:
         os_deps = local_scope["deps_os"].get(deps_os_key, {})
         if len(deps_to_include) > 1:
           # Ignore any overrides when including deps for more than one
           # platform, so we collect the broadest set of dependencies available.
           # We may end up with the wrong revision of something for our
@@ skipping 754 matching lines @@
 
 if "__main__" == __name__:
   try:
     result = Main(sys.argv)
   except gclient_utils.Error, e:
     print >> sys.stderr, "Error: %s" % str(e)
     result = 1
   sys.exit(result)
 
 # vim: ts=2:sw=2:tw=80:et: