Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1457)

Unified Diff: native_client_sdk/src/build_tools/manifest_util.py

Issue 10910101: fix pylint warnings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: native_client_sdk/src/build_tools/manifest_util.py
diff --git a/native_client_sdk/src/build_tools/manifest_util.py b/native_client_sdk/src/build_tools/manifest_util.py
index 57cab4f92c2cb72ec44693dc964132b74e7b2501..4a479d8f510aadafbae5eb021fba7ef3fa70fb04 100644
--- a/native_client_sdk/src/build_tools/manifest_util.py
+++ b/native_client_sdk/src/build_tools/manifest_util.py
@@ -106,6 +106,7 @@ class Archive(dict):
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):
@@ -141,7 +142,7 @@ class Archive(dict):
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:
if key not in VALID_ARCHIVE_KEYS:
raise Error('Archive "%s" has invalid attribute "%s"' % (host_os, key))
@@ -177,9 +178,9 @@ class Archive(dict):
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):
@@ -227,13 +228,13 @@ class Bundle(dict):
"""
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:
@@ -270,7 +271,7 @@ class Bundle(dict):
'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:
if key not in VALID_BUNDLES_KEYS:
raise Error('Bundle "%s" has invalid attribute "%s"' %
(self[NAME_KEY], key))
@@ -393,7 +394,7 @@ class SDKManifest(object):
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:
if key not in VALID_MANIFEST_KEYS:
raise Error('Manifest has invalid attribute "%s"' % key)
# Validate each bundle
@@ -412,7 +413,8 @@ class SDKManifest(object):
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):
« no previous file with comments | « native_client_sdk/src/build_tools/generate_make.py ('k') | native_client_sdk/src/build_tools/sdk_tools/sdk_update.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698