[Zope3-checkins] CVS: Zope3/src/transaction - __init__.py:1.4.8.2 _transaction.py:1.1.2.2

[Jeremy Hylton]

Update of /cvs-repository/Zope3/src/transaction
In directory cvs.zope.org:/tmp/cvs-serv12613/src/transaction

Modified Files:
      Tag: jeremy-txn-branch
	__init__.py _transaction.py 
Log Message:
Fix import problems for Zope3.


=== Zope3/src/transaction/__init__.py 1.4.8.1 => 1.4.8.2 ===
--- Zope3/src/transaction/__init__.py:1.4.8.1	Thu Mar 18 16:18:33 2004
+++ Zope3/src/transaction/__init__.py	Fri Mar 19 15:28:23 2004
@@ -12,8 +12,6 @@
 #
 ############################################################################
 
-##from ZODB.Transaction import get_transaction
-
 from transaction._transaction import Transaction
 from transaction._manager import TransactionManager
 
@@ -31,3 +29,4 @@
 def abort():
     manager.get().abort()
 
+get_transaction = get


=== Zope3/src/transaction/_transaction.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/transaction/_transaction.py:1.1.2.1	Thu Mar 18 16:18:33 2004
+++ Zope3/src/transaction/_transaction.py	Fri Mar 19 15:28:23 2004
@@ -86,8 +86,6 @@
 import sys
 import thread
 
-from ZODB.utils import oid_repr
-
 _marker = object()
 
 def myhasattr(obj, attr):
@@ -363,6 +361,8 @@
     This function does not raise an exception.
     """
     
+    from ZODB.utils import oid_repr
+
     # We should always be able to get __class__.
     klass = o.__class__.__name__
     # oid would be great, but may this isn't a persistent object.