From: Joshua Lock Date: Sat, 12 May 2012 00:58:57 +0000 (-0700) Subject: lib/bb/siggen: use open() rather than the file constructor X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb7fa0159ef01239cb3de956d1b1c528fe02162b;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git lib/bb/siggen: use open() rather than the file constructor The Python documentation states: "When opening a file, it’s preferable to use open() instead of invoking the file constructor directly." [1] Further in Python 3 direct use of the file constructor is no longer possible. 1. http://docs.python.org/library/functions.html#open (Bitbake rev: 759f953e29a7131614e5b1f0312edf2b17523675) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 8c79b178fb2..ca26919c9e9 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -201,7 +201,7 @@ class SignatureGeneratorBasic(SignatureGenerator): for dep in data['runtaskdeps']: data['runtaskhashes'][dep] = self.taskhash[dep] - p = pickle.Pickler(file(sigfile, "wb"), -1) + p = pickle.Pickler(open(sigfile, "wb"), -1) p.dump(data) def dump_sigs(self, dataCache): @@ -250,9 +250,9 @@ def clean_basepaths(a): return b def compare_sigfiles(a, b): - p1 = pickle.Unpickler(file(a, "rb")) + p1 = pickle.Unpickler(open(a, "rb")) a_data = p1.load() - p2 = pickle.Unpickler(file(b, "rb")) + p2 = pickle.Unpickler(open(b, "rb")) b_data = p2.load() def dict_diff(a, b, whitelist=set()): @@ -331,7 +331,7 @@ def compare_sigfiles(a, b): print "Hash for dependent task %s changed from %s to %s" % (dep, a[dep], b[dep]) def dump_sigfile(a): - p1 = pickle.Unpickler(file(a, "rb")) + p1 = pickle.Unpickler(open(a, "rb")) a_data = p1.load() print "basewhitelist: %s" % (a_data['basewhitelist'])