[Zodb-checkins] CVS: ZODB3/ZODB/zodb4 - z4iterator.py:1.1.2.5

[Fred L. Drake, Jr.]

Update of /cvs-repository/ZODB3/ZODB/zodb4
In directory cvs.zope.org:/tmp/cvs-serv24599

Modified Files:
      Tag: zope3-zodb3-devel-branch
	z4iterator.py 
Log Message:
revert ZODB3 compatibility changes; this will be done as part of the
conversion machinery itself


=== ZODB3/ZODB/zodb4/z4iterator.py 1.1.2.4 => 1.1.2.5 ===
--- ZODB3/ZODB/zodb4/z4iterator.py:1.1.2.4	Thu Jan 29 17:08:45 2004
+++ ZODB3/ZODB/zodb4/z4iterator.py	Fri Jan 30 12:29:59 2004
@@ -144,8 +144,8 @@
     def __init__(self, tid, status, user, desc, ext, pos, tend, file, tpos):
         self.tid = tid
         self.status = status
-        self.user = str8(user)
-        self.description = str8(desc)
+        self.user = user
+        self.description = desc
         self._extension = ext
         self._pos = pos
         self._tend = tend
@@ -194,17 +194,7 @@
     def __init__(self, oid, serial, version, data, data_txn, refs):
         self.oid = oid
         self.serial = serial
-        self.tid = serial   # XXX added for compatibility with ZODB 3
         self.version = version
         self.data = data
         self.data_txn = data_txn
         self.refs = refs
-
-# convert unicode strings to 8-bit strings
-
-def str8(s):
-    if isinstance(s, unicode):
-        # Should we use UTF-8 or ASCII?  Not sure.
-        return s.encode("ascii")
-    else:
-        return s