Merging Pauli's autoreload branch.

Original branch location:
  https://code.launchpad.net/~pauli-virtanen/ipython/ipython-autoreload

The branch is now marked as merged and should be closed.

IPython/Extensions/ipy_autoreload.py

@@ -252,6 +252,9 b" def autoreload_f(self, parameter_s=''):"
     %autoreload
     Reload all modules (except those excluded by %aimport) automatically now.
     
+    %autoreload 0
+    Disable automatic reloading.
+
     %autoreload 1
     Reload all modules imported with %aimport every time before executing
     the Python code typed.
@@ -260,14 +263,15 b" def autoreload_f(self, parameter_s=''):"
     Reload all modules (except those excluded by %aimport) every time
     before executing the Python code typed.
     
-    Reloading Python modules in a reliable way is in general difficult,
-    and unexpected things may occur. %autoreload tries to work
-    around common pitfalls by replacing code objects of functions
-    previously in the module with new versions. This makes the following
-    things to work:
+    Reloading Python modules in a reliable way is in general
+    difficult, and unexpected things may occur. %autoreload tries to
+    work around common pitfalls by replacing function code objects and
+    parts of classes previously in the module with new versions. This
+    makes the following things to work:
 
     - Functions and classes imported via 'from xxx import foo' are upgraded
       to new versions when 'xxx' is reloaded.
+
     - Methods and properties of classes are upgraded on reload, so that
       calling 'c.foo()' on an object 'c' created before the reload causes
       the new code for 'foo' to be executed.
@@ -277,8 +281,10 b" def autoreload_f(self, parameter_s=''):"
     - Replacing code objects does not always succeed: changing a @property
       in a class to an ordinary method or a method to a member variable
       can cause problems (but in old objects only).
+
     - Functions that are removed (eg. via monkey-patching) from a module
       before it is reloaded are not upgraded.
+
     - C extension modules cannot be reloaded, and so cannot be
       autoreloaded.
     
@@ -329,8 +335,11 b" def aimport_f(self, parameter_s=''):"
         except KeyError: pass
         reloader.modules[modname] = True
 
-        mod = __import__(modname)
-        ip.to_user_ns({modname: mod})
+        # Inject module to user namespace; handle also submodules properly
+        __import__(modname)
+        basename = modname.split('.')[0]
+        mod = sys.modules[basename]
+        ip.to_user_ns({basename: mod})
 
 def init():
     ip.expose_magic('autoreload', autoreload_f)