Explicit assignment of __module__ to classes, so that we don't catch

types that grow an __module__ in future versions of Python.

src/BTrees/IIBTree.py

@@ -17,6 +17,5 @@ from _IIBTree import *
 
 # We don't really want _ names in pickles, so update all of the __module__
 # references.
-##for o in globals().values():
-##    if hasattr(o, '__module__'):
-##        o.__module__=__name__
+for obj in IIBucket, IIBTree, IISet, IITreeSet:
+    obj.__module__ = __name__

src/BTrees/IOBTree.py

@@ -17,6 +17,5 @@ from _IOBTree import *
 
 # We don't really want _ names in pickles, so update all of the __module__
 # references.
-##for o in globals().values():
-##    if hasattr(o, '__module__'):
-##        o.__module__=__name__
+for obj in IOBucket, IOBTree, IOSet, IOTreeSet:
+    obj.__module__ = __name__

src/BTrees/OIBTree.py

@@ -17,6 +17,5 @@ from _OIBTree import *
 
 # We don't really want _ names in pickles, so update all of the __module__
 # references.
-for o in globals().values():
-    if hasattr(o, '__module__'):
-        o.__module__=__name__
+for obj in OIBucket, OIBTree, OISet, OITreeSet:
+    obj.__module__ = __name__

src/BTrees/OOBTree.py

@@ -17,6 +17,5 @@ from _OOBTree import *
 
 # We don't really want _ names in pickles, so update all of the __module__
 # references.
-for o in globals().values():
-    if hasattr(o, '__module__'):
-        o.__module__=__name__
+for obj in OOBucket, OOBTree, OOSet, OOTreeSet:
+    obj.__module__ = __name__