Patch #1112812: Make bsddb/__init__.py more friendly for modulefinder.

Backported to 2.4.

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 92fb253..a313d6e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -61,6 +61,8 @@ Extension Modules
 Library
 -------
 
+- Patch #1112812: Make bsddb/__init__.py more friendly for modulefinder.
+
 - Patch #1110248: SYNC_FLUSH the zlib buffer for GZipFile.flush.
 
 - Patch #1107973: Allow to iterate over the lines of a tarfile.ExFileObject.