Commit 1565e139 authored by Jeremy Hylton's avatar Jeremy Hylton

Only generated the warning if the oid is None.

If there is a jar and no oid, then the user assigned _p_jar directly.
All the Connection that assigns _p_jar also assigns an oid.
parent a085a310
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
############################################################################## ##############################################################################
"""Database connection support """Database connection support
$Id: Connection.py,v 1.130 2004/02/27 16:12:35 jeremy Exp $""" $Id: Connection.py,v 1.131 2004/03/01 19:07:25 jeremy Exp $"""
import logging import logging
import sys import sys
...@@ -102,7 +102,7 @@ class Connection(ExportImport, object): ...@@ -102,7 +102,7 @@ class Connection(ExportImport, object):
XXX Mention the database pool. XXX Mention the database pool.
$Id: Connection.py,v 1.130 2004/02/27 16:12:35 jeremy Exp $ $Id: Connection.py,v 1.131 2004/03/01 19:07:25 jeremy Exp $
@group User Methods: root, get, add, close, db, sync, isReadOnly, @group User Methods: root, get, add, close, db, sync, isReadOnly,
cacheFullSweep, cacheMinimize, getVersion, modifiedInVersion cacheFullSweep, cacheMinimize, getVersion, modifiedInVersion
...@@ -634,7 +634,7 @@ class Connection(ExportImport, object): ...@@ -634,7 +634,7 @@ class Connection(ExportImport, object):
policy of one transaction manager for each thread. policy of one transaction manager for each thread.
""" """
assert obj._p_jar is self assert obj._p_jar is self
if obj._p_oid is not None: if obj._p_oid is None:
# There is some old Zope code that assigns _p_jar # There is some old Zope code that assigns _p_jar
# directly. That is no longer allowed, but we need to # directly. That is no longer allowed, but we need to
# provide support for old code that still does it. # provide support for old code that still does it.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment