SF.net SVN: matplotlib: [5164] trunk/matplotlib

[<jd...@us...>]

Revision: 5164
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=5164&view=rev
Author:   jdh2358
Date:     2008-05-16 15:26:15 -0700 (Fri, 16 May 2008)

Log Message:
-----------
removed pre py2.4 compatability code and some other dead code

Modified Paths:
--------------
    trunk/matplotlib/API_CHANGES
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/_cm.py
    trunk/matplotlib/lib/matplotlib/axis.py
    trunk/matplotlib/lib/matplotlib/backends/backend_agg.py
    trunk/matplotlib/lib/matplotlib/backends/backend_cairo.py
    trunk/matplotlib/lib/matplotlib/backends/backend_emf.py
    trunk/matplotlib/lib/matplotlib/backends/backend_fltkagg.py
    trunk/matplotlib/lib/matplotlib/backends/backend_gdk.py
    trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
    trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py
    trunk/matplotlib/lib/matplotlib/backends/backend_ps.py
    trunk/matplotlib/lib/matplotlib/backends/backend_qt.py
    trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py
    trunk/matplotlib/lib/matplotlib/backends/backend_qtagg.py
    trunk/matplotlib/lib/matplotlib/backends/backend_template.py
    trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py
    trunk/matplotlib/lib/matplotlib/cbook.py
    trunk/matplotlib/lib/matplotlib/figure.py
    trunk/matplotlib/lib/matplotlib/pylab.py
    trunk/matplotlib/lib/matplotlib/text.py

Removed Paths:
-------------
    trunk/matplotlib/lib/subprocess/

Modified: trunk/matplotlib/API_CHANGES
===================================================================
--- trunk/matplotlib/API_CHANGES	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/API_CHANGES	2008-05-16 22:26:15 UTC (rev 5164)
@@ -1,3 +1,6 @@
+    matplotlib now requires python2.4, so matplotlib.cbook will no
+    loner provide set, enumerate, reversed or izip compatability functions
+
     In numpy 1.0 bins are specified by the left edges only.  The axes
     method "hist" now uses future numpy 1.3 semantic for histograms. 
     Providing binedges, the last value gives the upper-right edge now,

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/CHANGELOG	2008-05-16 22:26:15 UTC (rev 5164)
@@ -1,5 +1,11 @@
-2008-05-16 Reorganized examples dir
+2008-05-16 removed some unneeded code w/ the python 2.4 requirement.
+           cbook no longer provides compatibility for reversed,
+           enumerate, set or izip.  removed lib/subprocess, mpl1,
+           sandbox/units, and the swig code.  This stuff should remain
+           on the maintenance branch for archival purposes. JDH
 
+2008-05-16 Reorganized examples dir - JDH
+
 2008-05-16 Added 'elinewidth' keyword arg to errorbar, based on patch
            by Christopher Brown - MM
 

Modified: trunk/matplotlib/lib/matplotlib/_cm.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/_cm.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/_cm.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -11,7 +11,6 @@
 
 import matplotlib as mpl
 import matplotlib.colors as colors
-from matplotlib.cbook import reversed
 LUTSIZE = mpl.rcParams['image.lut']
 
 _binary_data = {

Modified: trunk/matplotlib/lib/matplotlib/axis.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axis.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/axis.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -4,7 +4,7 @@
 from __future__ import division
 
 from artist import Artist, setp
-from cbook import enumerate, silent_list, popall, CallbackRegistry
+from cbook import silent_list, popall, CallbackRegistry
 from lines import Line2D, TICKLEFT, TICKRIGHT, TICKUP, TICKDOWN
 from matplotlib import rcParams
 from patches import bbox_artist

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_agg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_agg.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_agg.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -31,8 +31,7 @@
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import RendererBase,\
      GraphicsContextBase, FigureManagerBase, FigureCanvasBase
-from matplotlib.cbook import enumerate, is_string_like, exception_to_str, \
-    maxdict
+from matplotlib.cbook import is_string_like, exception_to_str, maxdict
 from matplotlib.figure import Figure
 from matplotlib.font_manager import findfont
 from matplotlib.ft2font import FT2Font, LOAD_FORCE_AUTOHINT

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_cairo.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_cairo.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_cairo.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -36,7 +36,7 @@
 
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
      FigureManagerBase, FigureCanvasBase
-from matplotlib.cbook        import enumerate, izip, is_string_like
+from matplotlib.cbook        import is_string_like
 from matplotlib.figure       import Figure
 from matplotlib.mathtext     import MathTextParser
 from matplotlib.path         import Path

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_emf.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_emf.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_emf.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -17,7 +17,6 @@
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
      FigureManagerBase, FigureCanvasBase
-from matplotlib.cbook import enumerate
 from matplotlib.figure import Figure
 from matplotlib.transforms import Bbox
 

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_fltkagg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_fltkagg.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_fltkagg.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -20,7 +20,7 @@
 import matplotlib
 
 from matplotlib import rcParams, verbose
-from matplotlib.cbook import is_string_like,  enumerate
+from matplotlib.cbook import is_string_like
 from matplotlib.backend_bases import \
      RendererBase, GraphicsContextBase, FigureManagerBase, FigureCanvasBase,\
      NavigationToolbar2, cursors

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gdk.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_gdk.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_gdk.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -22,7 +22,7 @@
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
      FigureManagerBase, FigureCanvasBase
-from matplotlib.cbook import is_string_like, enumerate
+from matplotlib.cbook import is_string_like
 from matplotlib.figure import Figure
 from matplotlib.mathtext import MathTextParser
 from matplotlib.transforms import Affine2D

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_gtk.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -19,7 +19,7 @@
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
      FigureManagerBase, FigureCanvasBase, NavigationToolbar2, cursors
 from matplotlib.backends.backend_gdk import RendererGDK, FigureCanvasGDK
-from matplotlib.cbook import is_string_like, is_writable_file_like, enumerate
+from matplotlib.cbook import is_string_like, is_writable_file_like
 from matplotlib.colors import colorConverter
 from matplotlib.figure import Figure
 from matplotlib.widgets import SubplotTool

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_pdf.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -25,7 +25,7 @@
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
      FigureManagerBase, FigureCanvasBase
 from matplotlib.backends.backend_mixed import MixedModeRenderer
-from matplotlib.cbook import Bunch, enumerate, is_string_like, reverse_dict, \
+from matplotlib.cbook import Bunch, is_string_like, reverse_dict, \
     get_realpath_and_stat, is_writable_file_like, maxdict
 from matplotlib.figure import Figure
 from matplotlib.font_manager import findfont, is_opentype_cff_font

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_ps.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_ps.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_ps.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -14,7 +14,7 @@
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
      FigureManagerBase, FigureCanvasBase
 
-from matplotlib.cbook import is_string_like, izip, get_realpath_and_stat, \
+from matplotlib.cbook import is_string_like, get_realpath_and_stat, \
     is_writable_file_like, maxdict
 from matplotlib.figure import Figure
 

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_qt.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_qt.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_qt.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -5,7 +5,7 @@
 
 import matplotlib
 from matplotlib import verbose
-from matplotlib.cbook import is_string_like, enumerate, onetrue
+from matplotlib.cbook import is_string_like, onetrue
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
      FigureManagerBase, FigureCanvasBase, NavigationToolbar2, cursors
 from matplotlib._pylab_helpers import Gcf

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_qt4.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -5,7 +5,7 @@
 
 import matplotlib
 from matplotlib import verbose
-from matplotlib.cbook import is_string_like, enumerate, onetrue
+from matplotlib.cbook import is_string_like, onetrue
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
      FigureManagerBase, FigureCanvasBase, NavigationToolbar2, cursors
 from matplotlib._pylab_helpers import Gcf

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_qtagg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_qtagg.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_qtagg.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -6,7 +6,6 @@
 import os, sys
 import matplotlib
 from matplotlib import verbose
-from matplotlib.cbook import enumerate
 from matplotlib.figure import Figure
 
 from backend_agg import FigureCanvasAgg

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_template.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_template.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_template.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -49,7 +49,6 @@
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase,\
      FigureManagerBase, FigureCanvasBase
-from matplotlib.cbook import enumerate
 from matplotlib.figure import Figure
 from matplotlib.transforms import Bbox
 

Modified: trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/backends/backend_tkagg.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -11,7 +11,7 @@
 import os.path
 
 import matplotlib
-from matplotlib.cbook import is_string_like,  enumerate
+from matplotlib.cbook import is_string_like
 from matplotlib.backend_bases import RendererBase, GraphicsContextBase, \
      FigureManagerBase, FigureCanvasBase, NavigationToolbar2, cursors
 

Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/cbook.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/cbook.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -7,11 +7,6 @@
 import time, datetime
 import numpy as np
 
-try:
-    set = set
-except NameError:
-    from sets import Set as set
-
 major, minor1, minor2, s, tmp = sys.version_info
 
 
@@ -462,47 +457,7 @@
         return self.data[i % len(self.data)]
 
 
-# use enumerate builtin if available, else use python version
-try:
-    import __builtin__
-    enumerate = __builtin__.enumerate
-except:
-    def enumerate(seq):
-        """Python equivalent to the enumerate builtin function
-        enumerate() is new in Python 2.3
-        """
-        for i in range(len(seq)):
-            yield i, seq[i]
 
-
-# use reversed builtin if available, else use python version
-try:
-    import __builtin__
-    reversed = __builtin__.reversed
-except:
-    def reversed(seq):
-        """Python equivalent to the enumerate builtin function
-        enumerate() is new in Python 2.3
-        """
-        for i in range(len(seq)-1,-1,-1):
-            yield seq[i]
-
-
-# use itertools.izip if available, else use python version
-try:
-    import itertools
-    izip = itertools.izip
-except:
-    def izip(*iterables):
-        """Python equivalent to itertools.izip
-        itertools module - new in Python 2.3
-        """
-        iterables = map(iter, iterables)
-        while iterables:
-            result = [i.next() for i in iterables]
-            yield tuple(result)
-
-
 def get_split_ind(seq, N):
     """seq is a list of words.  Return the index into seq such that
     len(' '.join(seq[:ind])<=N

Modified: trunk/matplotlib/lib/matplotlib/figure.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/figure.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/figure.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -7,7 +7,7 @@
 import artist
 from artist import Artist
 from axes import Axes, SubplotBase, subplot_class_factory
-from cbook import flatten, allequal, Stack, iterable, dedent, set
+from cbook import flatten, allequal, Stack, iterable, dedent
 import _image
 import colorbar as cbar
 from image import FigureImage

Modified: trunk/matplotlib/lib/matplotlib/pylab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/pylab.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/pylab.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -195,7 +195,7 @@
 import sys, warnings
 
 from cbook import flatten, is_string_like, exception_to_str, popd, \
-     silent_list, iterable, enumerate, dedent
+     silent_list, iterable, dedent
 
 import numpy as np
 from numpy import ma

Modified: trunk/matplotlib/lib/matplotlib/text.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/text.py	2008-05-16 21:58:39 UTC (rev 5163)
+++ trunk/matplotlib/lib/matplotlib/text.py	2008-05-16 22:26:15 UTC (rev 5164)
@@ -10,7 +10,7 @@
 from matplotlib import rcParams
 import artist
 from artist import Artist
-from cbook import enumerate, is_string_like, maxdict
+from cbook import is_string_like, maxdict
 from font_manager import FontProperties
 from patches import bbox_artist, YAArrow
 from transforms import Affine2D, Bbox


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.