[Checkins] SVN: transaction/branches/sphinx/ Coverage for 'oid_hint'.

Tres Seaver cvs-admin at zope.org
Tue Dec 18 05:25:07 UTC 2012


Log message for revision 128750:
  Coverage for 'oid_hint'.

Changed:
  _U  transaction/branches/sphinx/
  U   transaction/branches/sphinx/transaction/_transaction.py
  U   transaction/branches/sphinx/transaction/tests/test__transaction.py

-=-
Modified: transaction/branches/sphinx/transaction/_transaction.py
===================================================================
--- transaction/branches/sphinx/transaction/_transaction.py	2012-12-18 05:25:06 UTC (rev 128749)
+++ transaction/branches/sphinx/transaction/_transaction.py	2012-12-18 05:25:06 UTC (rev 128750)
@@ -559,13 +559,14 @@
 
     This function does not raise an exception.
     """
-
     # We should always be able to get __class__.
     klass = o.__class__.__name__
-    # oid would be great, but may this isn't a persistent object.
+    # oid would be great, but maybe this isn't a persistent object.
     oid = getattr(o, "_p_oid", _marker)
     if oid is not _marker:
         oid = oid_repr(oid)
+    else:
+        oid = 'None'
     return "%s oid=%s" % (klass, oid)
 
 def oid_repr(oid):

Modified: transaction/branches/sphinx/transaction/tests/test__transaction.py
===================================================================
--- transaction/branches/sphinx/transaction/tests/test__transaction.py	2012-12-18 05:25:06 UTC (rev 128749)
+++ transaction/branches/sphinx/transaction/tests/test__transaction.py	2012-12-18 05:25:06 UTC (rev 128750)
@@ -1092,6 +1092,21 @@
         from transaction._transaction import rm_key
         self.assertEqual(rm_key(Resource('zzz')), 'zzz')
 
+    def test_object_hint_miss(self):
+        from transaction._transaction import object_hint
+        class _Test(object):
+            pass
+        test = _Test()
+        self.assertEqual(object_hint(test), "_Test oid=None")
+
+    def test_object_hint_hit(self):
+        from transaction._transaction import object_hint
+        class _Test(object):
+            pass
+        test = _Test()
+        test._p_oid = 'OID'
+        self.assertEqual(object_hint(test), "_Test oid='OID'")
+
     def test_BBB_join(self):
         # The join method is provided for "backward-compatability" with ZODB 4
         # data managers.



More information about the checkins mailing list