From 397032aa46e82c1891e11cc33121b80a04b3bcc7 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Thu, 25 Mar 1999 21:58:59 +0000
Subject: [PATCH] Don't use "exec" in find_class().  It's slow, unnecessary,
 and (as AMK points out) it doesn't work in JPython Applets.

---
 Lib/pickle.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Lib/pickle.py b/Lib/pickle.py
index fda4bd7caa4..7164eb1e395 100644
--- a/Lib/pickle.py
+++ b/Lib/pickle.py
@@ -661,15 +661,14 @@ class Unpickler:
     dispatch[GLOBAL] = load_global
 
     def find_class(self, module, name):
-        env = {}
-
         try:
-            exec 'from %s import %s' % (module, name) in env
-        except ImportError:
+            __import__(module)
+            mod = sys.modules[module]
+            klass = getattr(mod, name)
+        except (ImportError, KeyError, AttributeError):
             raise SystemError, \
                   "Failed to import class %s from module %s" % \
                   (name, module)
-        klass = env[name]
         return klass
 
     def load_reduce(self):