summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2005-03-03 09:45:32 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2005-03-03 09:45:32 (GMT)
commitffceedf822fb0b64a79ede9661fee5ad4b719464 (patch)
tree296c604e5c5239b2cc625621c4f8b3f5b8cd5b6c
parent2d2a32f0171da07ce083ee1610417cc5951a7858 (diff)
downloadcpython-ffceedf822fb0b64a79ede9661fee5ad4b719464.zip
cpython-ffceedf822fb0b64a79ede9661fee5ad4b719464.tar.gz
cpython-ffceedf822fb0b64a79ede9661fee5ad4b719464.tar.bz2
Patch #1112812: Make bsddb/__init__.py more friendly for modulefinder.
-rw-r--r--Lib/bsddb/__init__.py4
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 2 deletions
diff --git a/Lib/bsddb/__init__.py b/Lib/bsddb/__init__.py
index 3ee3441..0fc1892 100644
--- a/Lib/bsddb/__init__.py
+++ b/Lib/bsddb/__init__.py
@@ -65,9 +65,9 @@ import sys, os
# iterator interface is dynamically defined and added using a mixin
# class. old python can't tokenize it due to the yield keyword.
if sys.version >= '2.3':
+ import UserDict
+ from weakref import ref
exec """
-import UserDict
-from weakref import ref
class _iter_mixin(UserDict.DictMixin):
def _make_iter_cursor(self):
cur = self.db.cursor()
diff --git a/Misc/NEWS b/Misc/NEWS
index 79e4b71..c3ac9a8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,8 @@ Extension Modules
Library
-------
+- Patch #1112812: Make bsddb/__init__.py more friendly for modulefinder.
+
- Patch #1121234: Properly cleanup _exit and tkerror commands.
- Applied a security fix to SimpleXMLRPCserver (PSF-2005-001). This