diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2012-07-31 12:52:12 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-08-01 13:12:03 +0000 |
commit | 0032ccbd60f202ec76d9b738cddc8bdbf9f54133 (patch) | |
tree | cd398ab063be0bdab20b91cbd2420ad4981de813 /morphlib/cachekeycomputer.py | |
parent | 93a3d28ee51cc301cd79ff8bfabb2010defda09b (diff) | |
download | morph-0032ccbd60f202ec76d9b738cddc8bdbf9f54133.tar.gz |
python scripts: pep8ize codebase
This was done with the aid of the pep8 script, available by running
`easy_install pep8`.
It may be worth making this part of ./check, but that will require
putting pep8 into the development tools stratum.
This should be easy, given pep8 has no external dependencies.
Diffstat (limited to 'morphlib/cachekeycomputer.py')
-rw-r--r-- | morphlib/cachekeycomputer.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/morphlib/cachekeycomputer.py b/morphlib/cachekeycomputer.py index 85d13934..ca6776b7 100644 --- a/morphlib/cachekeycomputer.py +++ b/morphlib/cachekeycomputer.py @@ -1,14 +1,14 @@ # Copyright (C) 2012 Codethink Limited -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. @@ -34,8 +34,8 @@ class CacheKeyComputer(object): def compute_key(self, artifact): logging.debug('computing cache key for artifact %s from source ' 'repo %s, sha1 %s, filename %s' % - (artifact.name, artifact.source.repo_name, - artifact.source.sha1, artifact.source.filename)) + (artifact.name, artifact.source.repo_name, + artifact.source.sha1, artifact.source.filename)) return self._hash_id(self.get_cache_id(artifact)) def _hash_id(self, cache_id): @@ -68,8 +68,8 @@ class CacheKeyComputer(object): def get_cache_id(self, artifact): logging.debug('computing cache id for artifact %s from source ' 'repo %s, sha1 %s, filename %s' % - (artifact.name, artifact.source.repo_name, - artifact.source.sha1, artifact.source.filename)) + (artifact.name, artifact.source.repo_name, + artifact.source.sha1, artifact.source.filename)) try: return self._calculated[artifact] except KeyError: @@ -84,13 +84,13 @@ class CacheKeyComputer(object): 'filename': artifact.source.filename, 'kids': [self.compute_key(x) for x in artifact.dependencies] } - + kind = artifact.source.morphology['kind'] if kind == 'chunk': keys['ref'] = artifact.source.sha1 elif kind in ('system', 'stratum'): morphology = artifact.source.morphology - le_dict = dict((k,morphology[k]) for k in morphology.keys()) + le_dict = dict((k, morphology[k]) for k in morphology.keys()) checksum = hashlib.sha1() self._hash_thing(checksum, le_dict) keys['morphology-sha1'] = checksum.hexdigest() @@ -100,4 +100,3 @@ class CacheKeyComputer(object): keys['system-compatibility-version'] = "1~ (temporary, root rw)" return keys - |