Commit a8f33a01 authored by Tim Peters's avatar Tim Peters

Merge rev 28797 from ZODB trunk.

Merge rev 28470 from Zope3 trunk.

Typo repair checked in from a wrong project.
parent 31b41333
...@@ -227,9 +227,9 @@ class BaseObjectWriter: ...@@ -227,9 +227,9 @@ class BaseObjectWriter:
if not (oid is None or isinstance(oid, str)): if not (oid is None or isinstance(oid, str)):
# Deserves a closer look: # Deserves a closer look:
# Make sure it's not a descr # Make sure it's not a descriptor
if hasattr(oid, '__get__'): 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 ... # class whose instances are persistent, so ...
# Not persistent, pickle normally # Not persistent, pickle normally
return None return None
......
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