Implement find_class() without exec statement.

guido · guido · commit 5cef75b48b04 · 1997-03-14T04:21:10.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@7667 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Lib/pickle.py b/Lib/pickle.py
@@ -465,14 +465,12 @@ def load_class(self):
 	dispatch[CLASS] = load_class
 
 	def find_class(self, module, name):
-		env = {}
 		try:
-			exec 'from %s import %s' % (module, name) in env
-		except ImportError:
+			klass = getattr(__import__(module), name)
+		except (ImportError, AttributeError):
 			raise SystemError, \
 			      "Failed to import class %s from module %s" % \
 			      (name, module)
-		klass = env[name]
 		if type(klass) is BuiltinFunctionType:
 			raise SystemError, \
 			 "Imported object %s from module %s is not a class" % \
