[Zodb-checkins] SVN: ZODB/branches/3.3/src/ZODB/serialize.py Merge rev 28797 from ZODB trunk.

[Tim Peters]

Log message for revision 28798:
  Merge rev 28797 from ZODB trunk.
  
  Merge rev 28470 from Zope3 trunk.
  
  Typo repair checked in from a wrong project.
  

Changed:
  U   ZODB/branches/3.3/src/ZODB/serialize.py

-=-
Modified: ZODB/branches/3.3/src/ZODB/serialize.py
===================================================================
--- ZODB/branches/3.3/src/ZODB/serialize.py	2005-01-12 01:18:34 UTC (rev 28797)
+++ ZODB/branches/3.3/src/ZODB/serialize.py	2005-01-12 01:22:30 UTC (rev 28798)
@@ -227,9 +227,9 @@
         if not (oid is None or isinstance(oid, str)):
             # Deserves a closer look:
 
-            # Make sure it's not a descr
+            # Make sure it's not a descriptor
             if hasattr(oid, '__get__'):
-                # The oid is a decriptor.  That means obj is a non-persistent
+                # The oid is a descriptor.  That means obj is a non-persistent
                 # class whose instances are persistent, so ...
                 # Not persistent, pickle normally
                 return None