use getattr in import_item, shim_module

instead of looking directly in `__dict__`

IPython/utils/importstring.py

@@ -1,50 +1,39 b''
 # encoding: utf-8
 """
 A simple utility to import something by its string name.
-
-Authors:
-
-* Brian Granger
 """
 
-#-----------------------------------------------------------------------------
-#  Copyright (C) 2008-2011  The IPython Development Team
-#
-#  Distributed under the terms of the BSD License.  The full license is in
-#  the file COPYING, distributed as part of this software.
-#-----------------------------------------------------------------------------
+# Copyright (c) IPython Development Team.
+# Distributed under the terms of the Modified BSD License.
 
-#-----------------------------------------------------------------------------
-# Functions and classes
-#-----------------------------------------------------------------------------
 
 def import_item(name):
     """Import and return ``bar`` given the string ``foo.bar``.
 
     Calling ``bar = import_item("foo.bar")`` is the functional equivalent of
     executing the code ``from foo import bar``.
 
     Parameters
     ----------
     name : string
       The fully qualified name of the module/package being imported.
 
     Returns
     -------
     mod : module object
        The module that was imported.
     """
     
     parts = name.rsplit('.', 1)
     if len(parts) == 2:
         # called with 'foo.bar....'
         package, obj = parts
         module = __import__(package, fromlist=[obj])
         try:
-            pak = module.__dict__[obj]
-        except KeyError:
+            pak = getattr(module, obj)
+        except AttributeError:
             raise ImportError('No module named %s' % obj)
         return pak
     else:
         # called with un-dotted string
         return __import__(parts[0])

IPython/utils/shimmodule.py

@@ -1,43 +1,39 b''
 """A shim module for deprecated imports
 """
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
 import types
 
 class ShimModule(types.ModuleType):
 
     def __init__(self, *args, **kwargs):
         self._mirror = kwargs.pop("mirror")
         super(ShimModule, self).__init__(*args, **kwargs)
 
     def __getattr__(self, key):
         # Use the equivalent of import_item(name), see below
         name = "%s.%s" % (self._mirror, key)
 
-        # NOTE: the code below is copied *verbatim* from
+        # NOTE: the code below was copied *verbatim* from
         # importstring.import_item. For some very strange reason that makes no
         # sense to me, if we call it *as a function*, it doesn't work.  This
         # has something to do with the deep bowels of the import machinery and
         # I couldn't find a way to make the code work as a standard function
         # call.  But at least since it's an unmodified copy of import_item,
         # which is used extensively and has a test suite, we can be reasonably
         # confident this is OK.  If anyone finds how to call the function, all
         # the below could be replaced simply with:
         #
         # from IPython.utils.importstring import import_item
         # return import_item('MIRROR.' + key)
 
         parts = name.rsplit('.', 1)
         if len(parts) == 2:
             # called with 'foo.bar....'
             package, obj = parts
             module = __import__(package, fromlist=[obj])
-            try:
-                pak = module.__dict__[obj]
-            except KeyError:
-                raise AttributeError(obj)
-            return pak
+            return getattr(module, obj)
         else:
             # called with un-dotted string
             return __import__(parts[0])