Rename to avoid redefining a builtin.

tools/update_reference_build.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013 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.
 
 """Updates the Chrome reference builds.
 
 Before running this script, you should first verify that you are authenticated
 for SVN. You can do this by running:
@@ skipping 198 matching lines @@
           os.makedirs(os.path.dirname(dest))
         with z.open(content) as unzipped_content:
           logging.info('Extracting %s to %s (%s)', content, dest, dl_file)
           with file(dest, 'wb') as dest_file:
             dest_file.write(unzipped_content.read())
           permissions = z.getinfo(content).external_attr >> 16
           if permissions:
             os.chmod(dest, permissions)
     return True
 
-  def _ClearDir(self, dir):
-    """Clears all files in |dir| except for hidden files and folders."""
-    for root, dirs, files in os.walk(dir):
+  def _ClearDir(self, directory):
+    """Clears all files in |directory| except for hidden files and folders."""
+    for root, dirs, files in os.walk(directory):
       # Skip hidden files and folders (like .svn and .git).
       files = [f for f in files if f[0] != '.']
       dirs[:] = [d for d in dirs if d[0] != '.']
 
       for f in files:
         os.remove(os.path.join(root, f))
 
   def _ExtractBuilds(self):
     for platform in self._platforms:
       if os.path.exists('tmp_unzip'):
@@ skipping 54 matching lines @@
 def main(argv):
   logging.getLogger().setLevel(logging.DEBUG)
   version, options = ParseOptions(argv)
   b = BuildUpdater(version, options)
   b.DownloadAndUpdateBuilds()
   logging.info('Successfully updated reference builds. Move to '
                'reference_builds/reference_builds and make a change with gcl.')
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))