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

diff --git a/Lib/bsddb/__init__.py b/Lib/bsddb/__init__.py
index 3ee34416ddbe32f51beff115ce2de04a2cfcb2f2..0fc18928e1aadc8a67b8455a3968d19e753b65e5 100644 (file)
--- 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 79e4b71e21d40af0b0a8cc6dc541e13eb778e09e..c3ac9a87e495e473d6f2d6de98b1905f5f8d5e2a 100644 (file)
--- 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