Patchwork [bitbake-devel] lib/bb/siggen: use open() rather than the file constructor

login
register
mail settings
Submitter Joshua Lock
Date May 12, 2012, 12:58 a.m.
Message ID <1336784337-22053-1-git-send-email-josh@linux.intel.com>
Download mbox | patch
Permalink /patch/27493/
State Accepted
Commit 759f953e29a7131614e5b1f0312edf2b17523675
Headers show

Comments

Joshua Lock - May 12, 2012, 12:58 a.m.
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

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 lib/bb/siggen.py |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
index 8c79b17..ca26919 100644
--- a/lib/bb/siggen.py
+++ b/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'])