summaryrefslogtreecommitdiff
path: root/databases/zodb/files/patch-ZODB::ConflictResolution.py
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2007-03-22 17:08:45 +0000
committerMartin Wilke <miwi@FreeBSD.org>2007-03-22 17:08:45 +0000
commitda167dde05c07229f150c05d0009b582782c68a8 (patch)
tree7f1315791f29e0876179e56ed87fcc1eee2d9347 /databases/zodb/files/patch-ZODB::ConflictResolution.py
parent- Move stuffs that are after post.mk to appropriate places (diff)
2007-03-16 databases/zodb: outdated software, databases/zodb3 should be used
2007-03-19 finance/gnomepm: is unfetchable and has no homepage 2007-03-19 games/frabs: is unfetchable and homepage disappeared
Notes
Notes: svn path=/head/; revision=188044
Diffstat (limited to '')
-rw-r--r--databases/zodb/files/patch-ZODB::ConflictResolution.py17
1 files changed, 0 insertions, 17 deletions
diff --git a/databases/zodb/files/patch-ZODB::ConflictResolution.py b/databases/zodb/files/patch-ZODB::ConflictResolution.py
deleted file mode 100644
index ea874fe4f56b..000000000000
--- a/databases/zodb/files/patch-ZODB::ConflictResolution.py
+++ /dev/null
@@ -1,17 +0,0 @@
---- ZODB/ConflictResolution.py.orig Fri Dec 3 01:28:07 2004
-+++ ZODB/ConflictResolution.py Fri Dec 3 01:28:26 2004
-@@ -56,12 +56,12 @@
- data=None
-
- def __call__(self, oid,
-- getattr=getattr, None=None):
-+ getattr=getattr, _None=None):
-
- data=self.data
- if not data: data=self.data={}
-
-- r=data.get(oid, None)
-+ r=data.get(oid, _None)
- if r is None:
- r=PersistentReference()
- r.data=oid