fix pylint warnings

native_client_sdk/src/build_tools/manifest_util.py

 # Copyright (c) 2012 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.
 
 import copy
 import hashlib
 import json
 import sys
 
 MANIFEST_VERSION = 2
@@ skipping 88 matching lines @@
   """Generic error/exception for manifest_util module"""
   pass
 
 
 class Archive(dict):
   """A placeholder for sdk archive information. We derive Archive from
      dict so that it is easily serializable. """
 
   def __init__(self, host_os_name):
     """ Create a new archive for the given host-os name. """
+    super(Archive, self).__init__()
     self['host_os'] = host_os_name
 
   def CopyFrom(self, src):
     """Update the content of the archive by copying values from the given
        dictionary.
 
     Args:
       src: The dictionary whose values must be copied to the archive."""
     for key, value in src.items():
       self[key] = value
@@ skipping 15 matching lines @@
     if not self.get('size', None):
       raise Error('Archive "%s" has no size' % host_os)
     checksum = self.get('checksum', None)
     if not checksum:
       raise Error('Archive "%s" has no checksum' % host_os)
     elif not isinstance(checksum, dict):
       raise Error('Archive "%s" has a checksum, but it is not a dict' % host_os)
     elif not len(checksum):
       raise Error('Archive "%s" has an empty checksum dict' % host_os)
     # Verify that all key names are valid.
-    for key, val in self.iteritems():
+    for key in self.iterkeys():
       if key not in VALID_ARCHIVE_KEYS:
         raise Error('Archive "%s" has invalid attribute "%s"' % (host_os, key))
 
   def __getattr__(self, name):
     """Retrieve values from this dict using attributes.
 
     This allows for foo.bar instead of foo['bar'].
 
     Args:
       name: the name of the key, 'bar' in the example above.
@@ skipping 15 matching lines @@
       name: The name of the key, 'bar' in the example above.
       value: The value to associate with that key."""
     if name not in VALID_ARCHIVE_KEYS:
       raise AttributeError(name)
     # special case, self.checksum returns the sha1, not the checksum dict.
     if name == 'checksum':
       self.setdefault('checksum', {})['sha1'] = value
       return
     return self.__setitem__(name, value)
 
-  def GetChecksum(self, type='sha1'):
+  def GetChecksum(self, hash_type='sha1'):
     """Returns a given cryptographic checksum of the archive"""
-    return self['checksum'][type]
+    return self['checksum'][hash_type]
 
 
 class Bundle(dict):
   """A placeholder for sdk bundle information. We derive Bundle from
      dict so that it is easily serializable."""
 
   def __init__(self, obj):
     """ Create a new bundle with the given bundle name."""
     if isinstance(obj, str) or isinstance(obj, unicode):
       dict.__init__(self, [(ARCHIVES_KEY, []), (NAME_KEY, obj)])
@@ skipping 27 matching lines @@
 
   def LoadDataFromString(self, json_string):
     """Load a JSON bundle string. Raises an exception if json_string
        is not well-formed JSON.
 
     Args:
       json_string: a JSON-formatted string containing the bundle
     """
     self.CopyFrom(json.loads(json_string))
 
-  def CopyFrom(self, dict):
+  def CopyFrom(self, source):
     """Update the content of the bundle by copying values from the given
        dictionary.
 
     Args:
-      dict: The dictionary whose values must be copied to the bundle."""
-    for key, value in dict.items():
+      source: The dictionary whose values must be copied to the bundle."""
+    for key, value in source.items():
       if key == ARCHIVES_KEY:
         archives = []
         for a in value:
           new_archive = Archive(a['host_os'])
           new_archive.CopyFrom(a)
           archives.append(new_archive)
         self[ARCHIVES_KEY] = archives
       else:
         self[key] = value
 
@@ skipping 16 matching lines @@
                   self[NAME_KEY])
     # Check specific values
     if self['stability'] not in STABILITY_LITERALS:
       raise Error('Bundle "%s" has invalid stability field: "%s"' %
                   (self[NAME_KEY], self['stability']))
     if self['recommended'] not in YES_NO_LITERALS:
       raise Error(
           'Bundle "%s" has invalid recommended field: "%s"' %
           (self[NAME_KEY], self['recommended']))
     # Verify that all key names are valid.
-    for key, val in self.iteritems():
+    for key in self:

[binji, 2012/09/08 17:45:13]

you used self.iterkeys() above. Is one better than the other? Not sure, but may
as well be consistent.

[Sam Clegg, 2012/09/10 17:19:17]

iterkeys() is redundant.  Will remove.

       if key not in VALID_BUNDLES_KEYS:
         raise Error('Bundle "%s" has invalid attribute "%s"' %
                     (self[NAME_KEY], key))
     # Validate the archives
     for archive in self[ARCHIVES_KEY]:
       archive.Validate()
 
   def GetArchive(self, host_os_name):
     """Retrieve the archive for the given host os.
 
@@ skipping 102 matching lines @@
         "bundles": [],
         }
 
   def Validate(self):
     """Validate the Manifest file and raises an exception for problems"""
     # Validate the manifest top level
     if self._manifest_data["manifest_version"] > MANIFEST_VERSION:
       raise Error("Manifest version too high: %s" %
                   self._manifest_data["manifest_version"])
     # Verify that all key names are valid.
-    for key, val in self._manifest_data.iteritems():
+    for key in self._manifest_data:

[binji, 2012/09/08 17:45:13]

same here

[Sam Clegg, 2012/09/10 17:19:17]

done

       if key not in VALID_MANIFEST_KEYS:
         raise Error('Manifest has invalid attribute "%s"' % key)
     # Validate each bundle
     for bundle in self._manifest_data[BUNDLES_KEY]:
       bundle.Validate()
 
   def GetBundle(self, name):
     """Get a bundle from the array of bundles.
 
     Args:
       name: the name of the bundle to return.
     Return:
       The first bundle with the given name, or None if it is not found."""
     if not BUNDLES_KEY in self._manifest_data:
       return None
     bundles = [bundle for bundle in self._manifest_data[BUNDLES_KEY]
                if bundle[NAME_KEY] == name]
     if len(bundles) > 1:
-      WarningPrint("More than one bundle with name '%s' exists." % name)
+      sys.stderr.write("WARNING: More than one bundle with name"
+                       "'%s' exists.\n" % name)
     return bundles[0] if len(bundles) > 0 else None
 
   def GetBundles(self):
     """Return all the bundles in the manifest."""
     return self._manifest_data[BUNDLES_KEY]
 
   def SetBundle(self, new_bundle):
     """Replace named bundle.  Add if absent.
 
     Args:
@@ skipping 87 matching lines @@
           new_bundle.CopyFrom(b)
           bundles.append(new_bundle)
         self._manifest_data[key] = bundles
       else:
         self._manifest_data[key] = value
     self.Validate()
 
   def GetDataAsString(self):
     """Returns the current JSON manifest object, pretty-printed"""
     return DictToJSON(self._manifest_data)