Update of /usr/cvs/Public/pygresql/module
In directory druid.net:/tmp/cvs-serv7587/module
Modified Files:
pg.py
Log Message:
Remove code added for backwards compatibility with old style OID munging.
To see the diffs for this commit:
http://www.druid.net/pygresql/viewcvs.cgi/cvs/pygresql/module/pg.py.diff?r1=1.65&r2=1.66
Index: pg.py
===================================================================
RCS file: /usr/cvs/Public/pygresql/module/pg.py,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -u -r1.65 -r1.66
--- pg.py 23 Nov 2008 14:32:18 -0000 1.65
+++ pg.py 25 Nov 2008 18:15:23 -0000 1.66
@@ -5,7 +5,7 @@
# Written by D'Arcy J.M. Cain
# Improved by Christoph Zwerschke
#
-# $Id: pg.py,v 1.65 2008/11/23 14:32:18 cito Exp $
+# $Id: pg.py,v 1.66 2008/11/25 18:15:23 darcy Exp $
#
"""PyGreSQL classic interface.
@@ -439,13 +439,6 @@ class DB(object):
keyname = self.pkey(qcl)
fnames = self.get_attnames(qcl)
if isinstance(arg, dict):
- # XXX this code is for backwards compatibility and will be
- # XXX removed eventually
- if foid not in arg:
- ofoid = 'oid_' + self._split_schema(cl)[-1]
- if ofoid in arg:
- arg[foid] = arg[ofoid]
-
k = arg[keyname == 'oid' and foid or keyname]
else:
k = arg
@@ -535,13 +528,6 @@ class DB(object):
a = d
a.update(kw)
- # XXX this code is for backwards compatibility and will be
- # XXX removed eventually
- if foid not in a:
- ofoid = 'oid_' + self._split_schema(cl)[-1]
- if ofoid in a:
- a[foid] = a[ofoid]
-
if foid in a:
where = "oid=%s" % a[foid]
else:
@@ -617,13 +603,6 @@ class DB(object):
a = d
a.update(kw)
- # XXX this code is for backwards compatibility and will be
- # XXX removed eventually
- if foid not in a:
- ofoid = 'oid_' + self._split_schema(cl)[-1]
- if ofoid in a:
- a[foid] = a[ofoid]
-
q = 'DELETE FROM %s WHERE oid=%s' % (qcl, a[foid])
self._do_debug(q)
self.db.query(q)
_______________________________________________
PyGreSQL mailing list
[email protected]
http://mailman.vex.net/mailman/listinfo/pygresql
