Skip to content

Z
ZODB
Commit 403348f3 authored by Jeremy Hylton's avatar Jeremy Hylton
Browse files
Options

Merging latest PersistentMapping from the Standalone-1_0-branch. 

As the checkin message on the branch said, this should make the new
code work correctly using pickles generated by the old code.
parent fe2e7481
Show whitespace changes
Inline Side-by-side
Showing with 171 additions and 219 deletions
trunk/src/Persistence/PersistentMapping.py
View file @ 403348f3
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved. # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
# #
# This software is subject to the provisions of the Zope Public License, # This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. # Version 1.1 (ZPL). A copy of the ZPL should accompany this
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED # distribution. THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS # LIMITED TO, THE IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST
# FOR A PARTICULAR PURPOSE # INFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE.
#
##############################################################################
__doc__='''Python implementation of persistent base types
"""Python implementation of persistent base types
$Id: PersistentMapping.py,v 1.15 2001/11/28 22:20:11 chrism Exp $''' $Id: PersistentMapping.py,v 1.16 2001/11/28 23:59:02 jeremy Exp $"""
__version__='$Revision: 1.15 $'[11:-2]
__version__='$Revision: 1.16 $'[11:-2]
import Persistence import Persistence
import types from UserDict import UserDict
_marker=[] class PersistentMapping(UserDict, Persistence.Persistent):
class PersistentMapping(Persistence.Persistent):
"""A persistent wrapper for mapping objects. """A persistent wrapper for mapping objects.
This class allows wrapping of mapping objects so that This class allows wrapping of mapping objects so that object
object changes are registered. As a side effect, changes are registered. As a side effect, mapping objects may be
mapping objects may be subclassed. subclassed.
""" """
def __init__(self,container=None): __super_delitem = UserDict.__delitem__
if container is None: container={} __super_setitem = UserDict.__setitem__
self._container=container __super_clear = UserDict.clear
__super_update = UserDict.update
__super_setdefault = UserDict.setdefault
__super_popitem = UserDict.popitem
def __setstate__(self, state):
# The old PersistentMapping used _container to hold the data.
# We need to make the current code work with objects pickled
# using the old code. Unfortunately, this forces us to expose
# the rep of UserDict, because __init__() won't be called when
# a pickled object is being loaded.
if state.has_key('_container'):
assert not state.has_key('data'), \
("object state has _container and data attributes: %s"
% repr(state))
self.data = state['_container']
del state['_container']
for k, v in state.items():
self.__dict__[k] = v
def __delitem__(self, key): def __delitem__(self, key):
del self._container[key] self.__super_delitem(key)
try: del self._v_keys self._p_changed = 1
except: pass
self.__changed__(1)
def __getitem__(self, key):
return self._container[key]
def __len__(self): return len(self._container)
def __setitem__(self, key, v): def __setitem__(self, key, v):
self._container[key]=v self.__super_setitem(key, v)
try: del self._v_keys self._p_changed = 1
except: pass
self.__changed__(1)
def clear(self): def clear(self):
self._container.clear() self.__super_clear()
self._p_changed=1 self._p_changed = 1
if hasattr(self,'_v_keys'): del self._v_keys
def copy(self): return self.__class__(self._container.copy())
def get(self, key, default=_marker):
if default is _marker:
return self._container.get(key)
else:
return self._container.get(key, default)
def has_key(self,key): return self._container.has_key(key)
def items(self):
return map(lambda k, d=self: (k,d[k]), self.keys())
def keys(self):
try: return list(self._v_keys) # return a copy (Collector 2283)
except: pass
keys=self._v_keys=filter(
lambda k: not isinstance(k,types.StringType) or k[:1]!='_',
self._container.keys())
keys.sort()
return list(keys)
def update(self, b): def update(self, b):
a=self._container self.__super_update(b)
for k, v in b.items(): a[k] = v self._p_changed = 1
try: del self._v_keys
except: pass def setdefault(self, key, failobj=None):
self._p_changed=1 # We could inline all of UserDict's implementation into the
# method here, but I'd rather not depend at all on the
def values(self): # implementation in UserDict (simple as it is).
return map(lambda k, d=self: d[k], self.keys()) if not self.has_key(key):
self._p_changed = 1
def __cmp__(self,other): return self.__super_setdefault(key, failobj)
return cmp(self._container, other._container)
def popitem(self):
self._p_changed = 1
return self.__super_popitem()
trunk/src/ZODB/PersistentMapping.py
View file @ 403348f3
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved. # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
# #
# This software is subject to the provisions of the Zope Public License, # This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. # Version 1.1 (ZPL). A copy of the ZPL should accompany this
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED # distribution. THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS # LIMITED TO, THE IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST
# FOR A PARTICULAR PURPOSE # INFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE.
#
##############################################################################
__doc__='''Python implementation of persistent base types
"""Python implementation of persistent base types
$Id: PersistentMapping.py,v 1.15 2001/11/28 22:20:11 chrism Exp $''' $Id: PersistentMapping.py,v 1.16 2001/11/28 23:59:02 jeremy Exp $"""
__version__='$Revision: 1.15 $'[11:-2]
__version__='$Revision: 1.16 $'[11:-2]
import Persistence import Persistence
import types from UserDict import UserDict
_marker=[] class PersistentMapping(UserDict, Persistence.Persistent):
class PersistentMapping(Persistence.Persistent):
"""A persistent wrapper for mapping objects. """A persistent wrapper for mapping objects.
This class allows wrapping of mapping objects so that This class allows wrapping of mapping objects so that object
object changes are registered. As a side effect, changes are registered. As a side effect, mapping objects may be
mapping objects may be subclassed. subclassed.
""" """
def __init__(self,container=None): __super_delitem = UserDict.__delitem__
if container is None: container={} __super_setitem = UserDict.__setitem__
self._container=container __super_clear = UserDict.clear
__super_update = UserDict.update
__super_setdefault = UserDict.setdefault
__super_popitem = UserDict.popitem
def __setstate__(self, state):
# The old PersistentMapping used _container to hold the data.
# We need to make the current code work with objects pickled
# using the old code. Unfortunately, this forces us to expose
# the rep of UserDict, because __init__() won't be called when
# a pickled object is being loaded.
if state.has_key('_container'):
assert not state.has_key('data'), \
("object state has _container and data attributes: %s"
% repr(state))
self.data = state['_container']
del state['_container']
for k, v in state.items():
self.__dict__[k] = v
def __delitem__(self, key): def __delitem__(self, key):
del self._container[key] self.__super_delitem(key)
try: del self._v_keys self._p_changed = 1
except: pass
self.__changed__(1)
def __getitem__(self, key):
return self._container[key]
def __len__(self): return len(self._container)
def __setitem__(self, key, v): def __setitem__(self, key, v):
self._container[key]=v self.__super_setitem(key, v)
try: del self._v_keys self._p_changed = 1
except: pass
self.__changed__(1)
def clear(self): def clear(self):
self._container.clear() self.__super_clear()
self._p_changed=1 self._p_changed = 1
if hasattr(self,'_v_keys'): del self._v_keys
def copy(self): return self.__class__(self._container.copy())
def get(self, key, default=_marker):
if default is _marker:
return self._container.get(key)
else:
return self._container.get(key, default)
def has_key(self,key): return self._container.has_key(key)
def items(self):
return map(lambda k, d=self: (k,d[k]), self.keys())
def keys(self):
try: return list(self._v_keys) # return a copy (Collector 2283)
except: pass
keys=self._v_keys=filter(
lambda k: not isinstance(k,types.StringType) or k[:1]!='_',
self._container.keys())
keys.sort()
return list(keys)
def update(self, b): def update(self, b):
a=self._container self.__super_update(b)
for k, v in b.items(): a[k] = v self._p_changed = 1
try: del self._v_keys
except: pass def setdefault(self, key, failobj=None):
self._p_changed=1 # We could inline all of UserDict's implementation into the
# method here, but I'd rather not depend at all on the
def values(self): # implementation in UserDict (simple as it is).
return map(lambda k, d=self: d[k], self.keys()) if not self.has_key(key):
self._p_changed = 1
def __cmp__(self,other): return self.__super_setdefault(key, failobj)
return cmp(self._container, other._container)
def popitem(self):
self._p_changed = 1
return self.__super_popitem()
trunk/src/persistent/mapping.py
View file @ 403348f3
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved. # Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
# #
# This software is subject to the provisions of the Zope Public License, # This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution. # Version 1.1 (ZPL). A copy of the ZPL should accompany this
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED # distribution. THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # EXPRESS OR IMPLIED WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS # LIMITED TO, THE IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST
# FOR A PARTICULAR PURPOSE # INFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE.
#
##############################################################################
__doc__='''Python implementation of persistent base types
"""Python implementation of persistent base types
$Id: mapping.py,v 1.15 2001/11/28 22:20:11 chrism Exp $''' $Id: mapping.py,v 1.16 2001/11/28 23:59:02 jeremy Exp $"""
__version__='$Revision: 1.15 $'[11:-2]
__version__='$Revision: 1.16 $'[11:-2]
import Persistence import Persistence
import types from UserDict import UserDict
_marker=[] class PersistentMapping(UserDict, Persistence.Persistent):
class PersistentMapping(Persistence.Persistent):
"""A persistent wrapper for mapping objects. """A persistent wrapper for mapping objects.
This class allows wrapping of mapping objects so that This class allows wrapping of mapping objects so that object
object changes are registered. As a side effect, changes are registered. As a side effect, mapping objects may be
mapping objects may be subclassed. subclassed.
""" """
def __init__(self,container=None): __super_delitem = UserDict.__delitem__
if container is None: container={} __super_setitem = UserDict.__setitem__
self._container=container __super_clear = UserDict.clear
__super_update = UserDict.update
__super_setdefault = UserDict.setdefault
__super_popitem = UserDict.popitem
def __setstate__(self, state):
# The old PersistentMapping used _container to hold the data.
# We need to make the current code work with objects pickled
# using the old code. Unfortunately, this forces us to expose
# the rep of UserDict, because __init__() won't be called when
# a pickled object is being loaded.
if state.has_key('_container'):
assert not state.has_key('data'), \
("object state has _container and data attributes: %s"
% repr(state))
self.data = state['_container']
del state['_container']
for k, v in state.items():
self.__dict__[k] = v
def __delitem__(self, key): def __delitem__(self, key):
del self._container[key] self.__super_delitem(key)
try: del self._v_keys self._p_changed = 1
except: pass
self.__changed__(1)
def __getitem__(self, key):
return self._container[key]
def __len__(self): return len(self._container)
def __setitem__(self, key, v): def __setitem__(self, key, v):
self._container[key]=v self.__super_setitem(key, v)
try: del self._v_keys self._p_changed = 1
except: pass
self.__changed__(1)
def clear(self): def clear(self):
self._container.clear() self.__super_clear()
self._p_changed=1 self._p_changed = 1
if hasattr(self,'_v_keys'): del self._v_keys
def copy(self): return self.__class__(self._container.copy())
def get(self, key, default=_marker):
if default is _marker:
return self._container.get(key)
else:
return self._container.get(key, default)
def has_key(self,key): return self._container.has_key(key)
def items(self):
return map(lambda k, d=self: (k,d[k]), self.keys())
def keys(self):
try: return list(self._v_keys) # return a copy (Collector 2283)
except: pass
keys=self._v_keys=filter(
lambda k: not isinstance(k,types.StringType) or k[:1]!='_',
self._container.keys())
keys.sort()
return list(keys)
def update(self, b): def update(self, b):
a=self._container self.__super_update(b)
for k, v in b.items(): a[k] = v self._p_changed = 1
try: del self._v_keys
except: pass def setdefault(self, key, failobj=None):
self._p_changed=1 # We could inline all of UserDict's implementation into the
# method here, but I'd rather not depend at all on the
def values(self): # implementation in UserDict (simple as it is).
return map(lambda k, d=self: d[k], self.keys()) if not self.has_key(key):
self._p_changed = 1
def __cmp__(self,other): return self.__super_setdefault(key, failobj)
return cmp(self._container, other._container)
def popitem(self):
self._p_changed = 1
return self.__super_popitem()
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7