[Zope3-checkins] CVS: Zope3/src/zodb/code - class_.py:1.1.2.3 function.py:1.1.2.2 interfaces.py:1.1.2.3 module.py:1.1.2.4 patch.py:1.1.2.3
Tim Peters
tim.one@comcast.net
Tue, 24 Dec 2002 21:21:32 -0500
Update of /cvs-repository/Zope3/src/zodb/code
In directory cvs.zope.org:/tmp/cvs-serv19240/src/zodb/code
Modified Files:
Tag: NameGeddon-branch
class_.py function.py interfaces.py module.py patch.py
Log Message:
Whitespace normalization, via Python's Tools/scripts/reindent.py. The
files are fixed-points of that script now. Fixed a few cases where
code relied on significant trailing whitespace (ouch).
=== Zope3/src/zodb/code/class_.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/code/class_.py:1.1.2.2 Mon Dec 23 16:56:35 2002
+++ Zope3/src/zodb/code/class_.py Tue Dec 24 21:20:01 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# 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.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Persistent Classes."""
@@ -105,7 +105,7 @@
class ExtClassObject:
_missing = object()
-
+
def __init__(self, name, instdescr):
self.name = name
self.instdescr = instdescr
@@ -216,7 +216,7 @@
# always behave the way it does for normal classes
__implements__ = IPersistent
-
+
_pc_init = False
def __new__(meta, name, bases, dict):
@@ -243,7 +243,7 @@
for k, v in dict.items():
if isinstance(v, PersistentFunction):
setattr(cls, k, PersistentDescriptor(cls, v))
-
+
cls._pc_init = True
return cls
@@ -286,7 +286,7 @@
else:
return
super(PersistentClassMetaClass, cls).__delattr__(attr)
-
+
def __getstate__(cls):
dict = {}
for k, v in cls.__dict__.items():
@@ -333,4 +333,3 @@
delattr(cls, name)
for name in newnames:
setattr(cls, name, acls.__dict__[name])
-
=== Zope3/src/zodb/code/function.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/code/function.py:1.1.2.1 Mon Dec 23 14:30:48 2002
+++ Zope3/src/zodb/code/function.py Tue Dec 24 21:20:01 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# 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.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Persistent functions."""
@@ -145,7 +145,7 @@
# __dict__. We can't use a PersistentDict because the
# interpreter requires that globals be a real dict.
self._pf_module._p_activate()
-
+
# XXX What if the function module is deactivated while the
# function is executing? It seems like we need to expose
# refcounts at the Python level to guarantee that this will
=== Zope3/src/zodb/code/interfaces.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/code/interfaces.py:1.1.2.2 Mon Dec 23 17:22:36 2002
+++ Zope3/src/zodb/code/interfaces.py Tue Dec 24 21:20:01 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# 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.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
from zope.interface import Interface
=== Zope3/src/zodb/code/module.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zodb/code/module.py:1.1.2.3 Mon Dec 23 16:56:49 2002
+++ Zope3/src/zodb/code/module.py Tue Dec 24 21:20:01 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# 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.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Persistent Module."""
@@ -26,7 +26,7 @@
from zodb.code.function import PersistentFunction
from zodb.code.interfaces import IPersistentModuleManager
from zodb.code.interfaces \
- import IPersistentModuleImportRegistry, IPersistentModuleUpdateRegistry
+ import IPersistentModuleImportRegistry, IPersistentModuleUpdateRegistry
from zodb.code.patch import NameFinder, convert
from transaction import get_transaction
@@ -146,7 +146,7 @@
def remove(self, source):
self._registry.delModule(self._module.__name__)
self._module = None
-
+
def _fixup(self, new, old, module):
# Update persistent objects in place, and
# convert new functions to persistent functions
@@ -287,7 +287,7 @@
def findModule(self, name):
assert self._p_state != GHOST
return self.__modules.get(name)
-
+
def setModule(self, name, module):
if name in self.__modules:
raise ValueError, name
=== Zope3/src/zodb/code/patch.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/code/patch.py:1.1.2.2 Mon Dec 23 15:24:59 2002
+++ Zope3/src/zodb/code/patch.py Tue Dec 24 21:20:01 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# 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.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Patch references to auto-persistent objects in a module.
@@ -72,7 +72,7 @@
If the module is updated to:
x = lambda: 1
y = lambda: 2
-What are the desired semantics?
+What are the desired semantics?
"""
__metaclass__ = type
@@ -127,7 +127,7 @@
# XXX Add Persistent to the list of bases so that type (the
# base class of PersistentClassMetaClass) will create the
# correct C layout.
-
+
# We must maintain a linearizable MRO when adding Persistent
# to list of bases. In particular, object is in Persistent's
# __bases__ to Persistent must occur before object in the
@@ -140,7 +140,7 @@
newbases = bases[:i] + (Persistent,) + bases[i:]
else:
newbases = bases + (Persistent,)
-
+
return PersistentClassMetaClass(self._obj.__name__, newbases, dict)
class Pickler(pickle.Pickler):
@@ -172,7 +172,7 @@
else:
self.save_reduce(self.wrap(TypeWrapper, atype),
(atype.__bases__, atype.__dict__))
-
+
dispatch[TypeType] = save_type
dispatch[ClassType] = save_type
@@ -181,7 +181,7 @@
(func.func_defaults, func.func_dict))
dispatch[FunctionType] = save_function
-
+
# New-style classes don't have real dicts. They have dictproxies.
# There's no official way to spell the dictproxy type, so we have
# to get it by using type() on an example.
@@ -194,7 +194,7 @@
# those objects using the persistent_id() mechanism. There's
# no need to cover every type with this pickler, because it
# isn't being used for persistent just to create a copy.
-
+
# The ignored parameter is for compatible with Python 2.2,
# which has the old inst_persistent_id feature.
pid = self.persistent_id(object)