Update of /usr/cvs/Public/pygresql/module
In directory druid.net:/tmp/cvs-serv28406
Modified Files:
TEST_PyGreSQL_classic.py pg.py pgdb.py
Log Message:
Avoid bare excepts.
To see the diffs for this commit:
http://www.druid.net/pygresql/viewcvs.cgi/cvs/pygresql/module/TEST_PyGreSQL_classic.py.diff?r1=1.12&r2=1.13
Index: TEST_PyGreSQL_classic.py
===================================================================
RCS file: /usr/cvs/Public/pygresql/module/TEST_PyGreSQL_classic.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TEST_PyGreSQL_classic.py 22 Sep 2008 14:11:00 -0000 1.12
+++ TEST_PyGreSQL_classic.py 21 Nov 2008 13:10:51 -0000 1.13
@@ -9,8 +9,10 @@
dbhost = None
dbport = 5432
-try: from LOCAL_PyGreSQL import *
-except: pass
+try:
+ from LOCAL_PyGreSQL import *
+except ImportError:
+ pass
db = DB(dbname, dbhost, dbport)
db.query("SET DATESTYLE TO 'ISO'")
@@ -22,19 +24,25 @@
def setUp(self):
# create test tables if they don't exist
for t in ('_test1', '_test2'):
- try: db.query("CREATE SCHEMA " + t)
- except: pass
- try: db.query("CREATE TABLE %s._test_schema "
- "(%s int PRIMARY KEY)" % (t, t))
- except: pass
-
- try: db.query("CREATE TABLE _test_schema "
+ try:
+ db.query("CREATE SCHEMA " + t)
+ except Exception:
+ pass
+ try:
+ db.query("CREATE TABLE %s._test_schema "
+ "(%s int PRIMARY KEY)" % (t, t))
+ except Exception:
+ pass
+ try:
+ db.query("CREATE TABLE _test_schema "
"(_test int PRIMARY KEY, _i interval, dvar int DEFAULT 999)")
- except: pass
-
- try: db.query("CREATE VIEW _test_vschema AS "
- "SELECT _test, 'abc'::text AS _test2 FROM _test_schema")
- except: pass
+ except Exception:
+ pass
+ try:
+ db.query("CREATE VIEW _test_vschema AS "
+ "SELECT _test, 'abc'::text AS _test2 FROM _test_schema")
+ except Exception:
+ pass
def test_invalidname(self):
"""Make sure that invalid table names are caught"""
@@ -77,8 +85,10 @@
self.assertEqual(db.pkey('public.test1'), 'a')
def test_get(self):
- try: db.query("INSERT INTO _test_schema VALUES (1234)")
- except: pass # OK if it already exists
+ try:
+ db.query("INSERT INTO _test_schema VALUES (1234)")
+ except Exception:
+ pass # OK if it already exists
db.get('_test_schema', 1234)
db.get('_test_schema', 1234, keyname = '_test')
@@ -96,16 +106,20 @@
self.assertEqual(d['dvar'], 999)
def test_mixed_case(self):
- try: db.query('CREATE TABLE _test_mc ("_Test" int PRIMARY KEY)')
- except: pass
+ try:
+ db.query('CREATE TABLE _test_mc ("_Test" int PRIMARY KEY)')
+ except Exception:
+ pass
db.query("DELETE FROM _test_mc")
d = dict(_Test = 1234)
db.insert('_test_mc', d)
def test_update(self):
- try: db.query("INSERT INTO _test_schema VALUES (1234)")
- except: pass # OK if it already exists
+ try:
+ db.query("INSERT INTO _test_schema VALUES (1234)")
+ except Exception:
+ pass # OK if it already exists
r = db.get('_test_schema', 1234)
r['dvar'] = 123
@@ -127,11 +141,9 @@
from pg import _quote
self.assertEqual(_quote(1, 'int'), "1")
self.assertEqual(_quote(1, 'text'), "'1'")
- self.assertEqual(_quote(1, 'seq'), "1")
self.assertEqual(_quote(1, 'num'), "1")
self.assertEqual(_quote('1', 'int'), "1")
self.assertEqual(_quote('1', 'text'), "'1'")
- self.assertEqual(_quote('1', 'seq'), "1")
self.assertEqual(_quote('1', 'num'), "1")
self.assertEqual(_quote(None, 'int'), "NULL")
self.assertEqual(_quote(1, 'money'), "'1.00'")
@@ -151,11 +163,7 @@
self.assertEqual(_quote('true', 'bool'), "'t'")
self.assertEqual(_quote('y', 'bool'), "'t'")
self.assertEqual(_quote('', 'date'), "NULL")
- self.assertEqual(_quote('', 'inet'), "NULL")
- self.assertEqual(_quote('', 'cidr'), "NULL")
self.assertEqual(_quote('date', 'date'), "'date'")
- self.assertEqual(_quote('inet', 'inet'), "'inet'")
- self.assertEqual(_quote('cidr', 'cidr'), "'cidr'")
self.assertEqual(_quote('', 'text'), "''")
self.assertEqual(_quote("\\", 'text'), "'\\\\'")
self.assertEqual(_quote("'", 'text'), "''''")
http://www.druid.net/pygresql/viewcvs.cgi/cvs/pygresql/module/pg.py.diff?r1=1.60&r2=1.61
Index: pg.py
===================================================================
RCS file: /usr/cvs/Public/pygresql/module/pg.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- pg.py 21 Nov 2008 13:00:21 -0000 1.60
+++ pg.py 21 Nov 2008 13:10:51 -0000 1.61
@@ -5,7 +5,7 @@
# Written by D'Arcy J.M. Cain
# Improved by Christoph Zwerschke
#
-# $Id: pg.py,v 1.60 2008/11/21 13:00:21 cito Exp $
+# $Id: pg.py,v 1.61 2008/11/21 13:10:51 cito Exp $
#
"""PyGreSQL classic interface.
@@ -221,13 +221,10 @@
"""
# There is no such shared library function.
if self._closeable:
+ db = connect(*self._args[0], **self._args[1])
if self.db:
self.db.close()
- try:
- self.db = connect(*self._args[0], **self._args[1])
- except:
- self.db = None
- raise
+ self.db = db
def query(self, qstr):
"""Executes a SQL command string.
@@ -502,7 +499,7 @@
# If no read perms (it can and does happen), return None.
try:
return self.get(qcl, a, 'oid')
- except:
+ except Exception:
return None
def update(self, cl, d = None, **kw):
@@ -542,7 +539,7 @@
else:
try:
pk = self.pkey(qcl)
- except:
+ except Exception:
raise ProgrammingError(
'Update needs primary key or oid as %s' % foid)
where = "%s='%s'" % (pk, a[pk])
http://www.druid.net/pygresql/viewcvs.cgi/cvs/pygresql/module/pgdb.py.diff?r1=1.46&r2=1.47
Index: pgdb.py
===================================================================
RCS file: /usr/cvs/Public/pygresql/module/pgdb.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- pgdb.py 19 Nov 2008 18:24:40 -0000 1.46
+++ pgdb.py 21 Nov 2008 13:10:51 -0000 1.47
@@ -4,7 +4,7 @@
#
# Written by D'Arcy J.M. Cain
#
-# $Id: pgdb.py,v 1.46 2008/11/19 18:24:40 darcy Exp $
+# $Id: pgdb.py,v 1.47 2008/11/21 13:10:51 cito Exp $
#
"""pgdb - DB-API 2.0 compliant module for PygreSQL.
@@ -255,7 +255,7 @@
if not self._dbcnx._tnx:
try:
self._cnx.source().execute(sql)
- except:
+ except Exception:
raise OperationalError("can't start transaction")
self._dbcnx._tnx = True
for params in param_seq:
@@ -272,8 +272,6 @@
raise DatabaseError("error '%s' in '%s'" % (msg, sql))
except Exception, err:
raise OperationalError("internal error in '%s': %s" % (sql, err))
- except:
- raise OperationalError("internal error in '%s'" % sql)
# then initialize result raw count and description
if self._src.resulttype == RESULT_DQL:
self.rowcount = self._src.ntuples
@@ -360,7 +358,7 @@
self._type_cache = pgdbTypeCache(cnx)
try:
self._cnx.source()
- except:
+ except Exception:
raise OperationalError("invalid connection")
def close(self):
@@ -378,7 +376,7 @@
self._tnx = False
try:
self._cnx.source().execute("COMMIT")
- except:
+ except Exception:
raise OperationalError("can't commit")
else:
raise OperationalError("connection has been closed")
@@ -390,7 +388,7 @@
self._tnx = False
try:
self._cnx.source().execute("ROLLBACK")
- except:
+ except Exception:
raise OperationalError("can't rollback")
else:
raise OperationalError("connection has been closed")
@@ -400,7 +398,7 @@
if self._cnx:
try:
return pgdbCursor(self)
- except:
+ except Exception:
raise OperationalError("invalid connection")
else:
raise OperationalError("connection has been closed")
_______________________________________________
PyGreSQL mailing list
[email protected]
http://mailman.vex.net/mailman/listinfo/pygresql
