From 6aaccc6b55a684771abfdad74bea742c25ded506 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Sun, 11 Jun 2006 08:35:14 +0000 Subject: Fix errors found by pychecker --- Lib/bsddb/dbrecio.py | 6 +++--- Lib/bsddb/dbtables.py | 6 ++++++ Lib/compiler/symbols.py | 2 +- Lib/compiler/transformer.py | 2 -- Lib/ctypes/util.py | 3 +-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Lib/bsddb/dbrecio.py b/Lib/bsddb/dbrecio.py index 22e382a..d439f32 100644 --- a/Lib/bsddb/dbrecio.py +++ b/Lib/bsddb/dbrecio.py @@ -75,7 +75,7 @@ class DBRecIO: dlen = newpos - self.pos - r = self.db.get(key, txn=self.txn, dlen=dlen, doff=self.pos) + r = self.db.get(self.key, txn=self.txn, dlen=dlen, doff=self.pos) self.pos = newpos return r @@ -121,7 +121,7 @@ class DBRecIO: "Negative size not allowed") elif size < self.pos: self.pos = size - self.db.put(key, "", txn=self.txn, dlen=self.len-size, doff=size) + self.db.put(self.key, "", txn=self.txn, dlen=self.len-size, doff=size) def write(self, s): if self.closed: @@ -131,7 +131,7 @@ class DBRecIO: self.buflist.append('\0'*(self.pos - self.len)) self.len = self.pos newpos = self.pos + len(s) - self.db.put(key, s, txn=self.txn, dlen=len(s), doff=self.pos) + self.db.put(self.key, s, txn=self.txn, dlen=len(s), doff=self.pos) self.pos = newpos def writelines(self, list): diff --git a/Lib/bsddb/dbtables.py b/Lib/bsddb/dbtables.py index 369db43..492d5fd 100644 --- a/Lib/bsddb/dbtables.py +++ b/Lib/bsddb/dbtables.py @@ -32,6 +32,12 @@ except ImportError: # For Python 2.3 from bsddb.db import * +# XXX(nnorwitz): is this correct? DBIncompleteError is conditional in _bsddb.c +try: + DBIncompleteError +except NameError: + class DBIncompleteError(Exception): + pass class TableDBError(StandardError): pass diff --git a/Lib/compiler/symbols.py b/Lib/compiler/symbols.py index c608f64..8eb5fce 100644 --- a/Lib/compiler/symbols.py +++ b/Lib/compiler/symbols.py @@ -191,7 +191,7 @@ class GenExprScope(Scope): self.add_param('[outmost-iterable]') def get_names(self): - keys = Scope.get_names() + keys = Scope.get_names(self) return keys class LambdaScope(FunctionScope): diff --git a/Lib/compiler/transformer.py b/Lib/compiler/transformer.py index e1a9775..d30cc1a 100644 --- a/Lib/compiler/transformer.py +++ b/Lib/compiler/transformer.py @@ -729,8 +729,6 @@ class Transformer: def atom(self, nodelist): return self._atom_dispatch[nodelist[0][0]](nodelist) - n.lineno = nodelist[0][2] - return n def atom_lpar(self, nodelist): if nodelist[1][0] == token.RPAR: diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py index d756c1c..094b029 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -1,5 +1,4 @@ import sys, os -import ctypes # find_library(name) returns the pathname of a library, or None. if os.name == "nt": @@ -41,7 +40,7 @@ if os.name == "posix" and sys.platform == "darwin": elif os.name == "posix": # Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump - import re, tempfile + import re, tempfile, errno def _findLib_gcc(name): expr = '[^\(\)\s]*lib%s\.[^\(\)\s]*' % name -- cgit v0.12