Minor cleanups, ipython now handles draw_if_interactive properly without ugly pylab hacks.

fperez · fperez · commit 1ebd3456846e · 2005-02-12T01:43:34.000Z
svn path=/trunk/matplotlib/; revision=959
diff --git a/lib/matplotlib/backends/__init__.py b/lib/matplotlib/backends/__init__.py
@@ -1,7 +1,6 @@
 import sys
 import matplotlib
 
-
 __all__ = ['backend','show','draw_if_interactive','error_msg',
            'new_figure_manager', 'backend_version']
 
@@ -14,7 +13,6 @@
 if backend not in all_backends:
     raise ValueError, 'Unrecognized backend %s' % backend
 
-
 # Import the requested backend into a generic module object
 backend_name = 'backend_'+backend.lower()
 backend_mod = __import__('matplotlib.backends.'+backend_name,
@@ -27,23 +25,11 @@
     backend_version = getattr(backend_mod,'backend_version')
 else: backend_version = 'unknown'
 
-
 # Now define the public API according to the kind of backend in use
 if backend in interactive_bk:
     error_msg  = backend_mod.error_msg
     show       = backend_mod.show
-    __draw_int = backend_mod.draw_if_interactive
-
-    # wrap draw_if_interactive with a flag which detects if it was called.
-    # This allows tools like ipython to properly manage interactive scripts.
-    # In python 2.4, this can be cleanly done with a simple decorator.
-    def draw_if_interactive():
-        draw_if_interactive._called = True
-        __draw_int()
-    # Flag to store state, so external callers (like ipython) can keep track
-    # of draw calls.
-    draw_if_interactive._called = False
-    draw_if_interactive.__doc__ = __draw_int.__doc__
+    draw_if_interactive = backend_mod.draw_if_interactive
 else:  # non-interactive backends
     def draw_if_interactive():  pass
     def show(): pass
@@ -59,5 +45,4 @@ def error_msg(m):
     Toolbar = backend_mod.Toolbar
     __all__.append('Toolbar')
 
-matplotlib.verbose.report('backend %s version %s' %
-                          (backend, backend_version))
+matplotlib.verbose.report('backend %s version %s' % (backend,backend_version))
