*** empty log message ***

jdh2358 · jdh2358 · commit 7345b612fc77 · 2005-08-17T15:16:37.000Z
svn path=/trunk/matplotlib/; revision=1651
diff --git a/API_CHANGES b/API_CHANGES
@@ -1,5 +1,7 @@
 API Changes in matplotlib-0.84
 
+    set removed - no more deprecation warnings
+
     backend developers: Added flipud method to image and removed it
     from to_str.  Removed origin kwarg from backend.draw_image.
     origin is handled entirely by the frontend now.
diff --git a/examples/dynamic_image_gtkagg.py b/examples/dynamic_image_gtkagg.py
@@ -8,7 +8,7 @@
 from matplotlib import rcParams
 
 from pylab import *
-import gtk
+import gobject, gtk
 
 fig = figure(1)
 a = subplot(111)
@@ -39,5 +39,5 @@ def updatefig(*args):
 
 cnt = 0
 
-gtk.idle_add(updatefig)
+gobject.idle_add(updatefig)
 show()
diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py
@@ -423,11 +423,6 @@ def get(o, *args, **kwargs):
     return getp(o, *args, **kwargs)
 get.__doc__ = getp.__doc__
 
-def set(*args, **kwargs):
-    message = 'set deprecated because it overrides python2.4 builtin set.  Use setp'
-    warnings.warn(message, DeprecationWarning, stacklevel=2)
-
-    return setp(*args, **kwargs)
 
 def setp(h, *args, **kwargs):
     """
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1356,8 +1356,13 @@ def redraw_in_frame(self):
     def get_renderer_cache(self):
         return self._cachedRenderer
     
-    def draw(self, renderer, inframe=False):
+    def draw(self, renderer=None, inframe=False):
         "Draw everything (plot lines, axes, labels)"
+        if renderer is None:
+            renderer = self._cachedRenderer
+
+        if renderer is None:
+            raise RuntimeError('No renderer defined')
         if not self.get_visible(): return
         renderer.open_group('axes')
 
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -720,18 +720,18 @@ def blit(self, bbox=None):
 
     def draw_event(self, renderer):
         event = DrawEvent('draw_event', self, renderer)
-        for cid, func in self.callbacks.get('draw_event', {}).items():
+        for func in self.callbacks.get('draw_event', {}).values():
             func(event)
 
     def key_press_event(self, key, guiEvent=None):
         self._key = key
         event = KeyEvent('key_press_event', self, key, self._lastx, self._lasty, guiEvent=guiEvent)
-        for cid, func in self.callbacks.get('key_press_event', {}).items():
+        for func in self.callbacks.get('key_press_event', {}).values():
             func(event)
 
     def key_release_event(self, key, guiEvent=None):
         event = KeyEvent('key_release_event', self, key, self._lastx, self._lasty, guiEvent=guiEvent)
-        for cid, func in self.callbacks.get('key_release_event', {}).items():
+        for func in self.callbacks.get('key_release_event', {}).values():
             func(event)
         self._key = None
 
@@ -743,7 +743,7 @@ def button_press_event(self, x, y, button, guiEvent=None):
         """
         self._button = button
         event = MouseEvent('button_press_event', self, x, y, button, self._key, guiEvent=guiEvent)
-        for cid, func in self.callbacks.get('button_press_event', {}).items():
+        for func in self.callbacks.get('button_press_event', {}).values():
             func(event)
 
     def button_release_event(self, x, y, button, guiEvent=None):
@@ -754,7 +754,7 @@ def button_release_event(self, x, y, button, guiEvent=None):
         """
 
         event = MouseEvent('button_release_event', self, x, y, button, self._key, guiEvent=guiEvent)
-        for cid, func in self.callbacks.get('button_release_event', {}).items():
+        for func in self.callbacks.get('button_release_event', {}).values():
             func(event)
         self._button = None
 
@@ -766,7 +766,7 @@ def motion_notify_event(self, x, y, guiEvent=None):
         """
         self._lastx, self._lasty = x, y
         event = MouseEvent('motion_notify_event', self, x, y, self._button, self._key, guiEvent=guiEvent)
-        for cid, func in self.callbacks.get('motion_notify_event', {}).items():
+        for func in self.callbacks.get('motion_notify_event', {}).values():
             func(event)
 
     def draw(self, *args, **kwargs):
@@ -841,7 +841,8 @@ def func(event)
         return value is a connection id that can be used with
         mpl_disconnect """
 
-        assert s in  ('draw_event',
+        assert s in  (
+        'draw_event',
         'key_press_event',
         'key_release_event',
         'button_press_event',
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
@@ -1506,13 +1506,6 @@ def samplemat(dims):
     else:
         return fig
 
-def set(*args, **kwargs):
-    message = 'set deprecated because it overrides python2.4 builtin set.  Use setp'
-    warnings.warn(message, DeprecationWarning, stacklevel=2)
-
-    return setp(*args, **kwargs)
-
-
 
 def setp(*args, **kwargs):
     ret = _setp(*args, **kwargs)
