From f444c88e3decd52ffc30aeb02ea3f11c23e6996b Mon Sep 17 00:00:00 2001 From: "yusuke.shinyama.dummy" Date: Fri, 6 Nov 2009 15:10:29 +0000 Subject: [PATCH] testing against None with "is", not using "==" git-svn-id: https://pdfminerr.googlecode.com/svn/trunk/pdfminer@153 1aa58f4a-7d42-0410-adbc-911cccaed67c --- pdfminer/pdffont.py | 6 +++--- pdfminer/pdftypes.py | 4 ++-- pdfminer/pycdb.py | 2 +- pdfminer/utils.py | 2 +- tools/dumppdf.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pdfminer/pdffont.py b/pdfminer/pdffont.py index 9b7f0f5..9e43dc1 100644 --- a/pdfminer/pdffont.py +++ b/pdfminer/pdffont.py @@ -513,12 +513,12 @@ class PDFCIDFont(PDFFont): dic = {} char1 = char2 = None for v in seq: - if char1 == None: + if char1 is None: char1 = v - elif char2 == None and isinstance(v, int): + elif char2 is None and isinstance(v, int): char2 = v else: - if char2 == None: + if char2 is None: for (i,w) in enumerate(v): dic[char1+i] = w else: diff --git a/pdfminer/pdftypes.py b/pdfminer/pdftypes.py index 51d7c2e..5d0a204 100644 --- a/pdfminer/pdftypes.py +++ b/pdfminer/pdftypes.py @@ -177,7 +177,7 @@ class PDFStream(PDFObject): raise Exception, "zlib.error while decompressing data" def decode(self): - assert self.data == None and self.rawdata != None + assert self.data is None and self.rawdata != None data = self.rawdata if self.decipher: # Handle encryption @@ -231,7 +231,7 @@ class PDFStream(PDFObject): return def get_data(self): - if self.data == None: + if self.data is None: self.decode() return self.data diff --git a/pdfminer/pycdb.py b/pdfminer/pycdb.py index 63319da..1b15ba1 100755 --- a/pdfminer/pycdb.py +++ b/pdfminer/pycdb.py @@ -90,7 +90,7 @@ class CDBReader(object): (pos_bucket, ncells) = self._hash0[h1] if ncells == 0: raise KeyError(k) hs = self._hash1[h1] - if hs == None: + if hs is None: self._fp.seek(pos_bucket) hs = decode(self._fp.read(ncells * 8)) self._hash1[h1] = hs diff --git a/pdfminer/utils.py b/pdfminer/utils.py index c743885..e390f84 100644 --- a/pdfminer/utils.py +++ b/pdfminer/utils.py @@ -33,7 +33,7 @@ def pick(seq, func, maxobj=None): maxscore = None for obj in seq: score = func(obj) - if maxscore == None or maxscore < score: + if maxscore is None or maxscore < score: (maxscore,maxobj) = (score,obj) return maxobj diff --git a/tools/dumppdf.py b/tools/dumppdf.py index b8fbbbf..60c62d7 100755 --- a/tools/dumppdf.py +++ b/tools/dumppdf.py @@ -83,7 +83,7 @@ def dumpallobjs(out, doc, codec=None): for objid in xref.objids(): try: obj = doc.getobj(objid) - if obj == None: continue + if obj is None: continue out.write('\n' % objid) dumpxml(out, obj, codec=codec) out.write('\n\n\n')