fixed os.rename bug

svn path=/trunk/matplotlib/; revision=1832

Author: jdh2358

CHANGELOG

@@ -1,5 +1,9 @@
 New entries should be added at the top
 
+2005-10-10 Replaced all instances of os.rename with shutil.move
+
+2005-10-05 Added Michael Brady's ydate patch
+
 2005-10-04 Added rkern's texmanager patch
 
 2005-09-25 contour.py modified to use a single ContourSet class

lib/matplotlib/__init__.py

@@ -143,11 +143,11 @@
 from __future__ import generators
 
 
-__version__  = '0.84'
+__version__  = '0.85.cvs'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 
-import sys, os, warnings
+import sys, os, warnings, shutil
 import distutils.sysconfig
 
 if not hasattr(sys, 'argv'):  # for modpython
@@ -758,7 +758,7 @@ def matplotlib_fname():
 WARNING: Old rc filename ".matplotlibrc" found in working dir
   and and renamed to new default rc file name "matplotlibrc"
   (no leading"dot"). """
-        os.rename('.matplotlibrc', 'matplotlibrc')
+        shutil.move('.matplotlibrc', 'matplotlibrc')
 
     home = get_home()
     oldname = os.path.join( home, '.matplotlibrc')
@@ -769,7 +769,7 @@ def matplotlib_fname():
 WARNING: Old rc filename "%s" found and renamed to
   new default rc file name "%s"."""%(oldname, newname)
 
-        os.rename(oldname, newname)
+        shutil.move(oldname, newname)
 
 
     fname = os.path.join( os.getcwd(), 'matplotlibrc')

lib/matplotlib/axes.py

@@ -2591,33 +2591,43 @@ def plot(self, *args, **kwargs):
         self.autoscale_view()
         return lines
 
-    def plot_date(self, d, y, fmt='bo', tz=None, **kwargs):
+    def plot_date(self, x, y, fmt='bo', tz=None, xdate=True, ydate=False,
+                  **kwargs):
         """
-        PLOT_DATE(d, y, fmt='bo', tz=None, **kwargs)
+        PLOT_DATE(x, y, fmt='bo', tz=None, xdate=True, ydate=False, **kwargs)
 
-        d is a sequence of dates represented as float days since
-        0001-01-01 UTC and y are the y values at those dates.  fmt is
-        a plot format string.  kwargs are passed on to plot.  See plot
-        for more information.
+        Similar to the plot() command, except the x or y (or both) data
+        is considered to be dates, and the axis is labeled accordingly.
+
+        x or y (or both) can be a sequence of dates represented as
+        float days since 0001-01-01 UTC.
+
+        fmt is a plot format string.
+
+        tz is the time zone to use in labelling dates.  Defaults to rc value.
+
+        If xdate is True, the x-axis will be labeled with dates.
+
+        If ydate is True, the y-axis will be labeled with dates.
+
+        kwargs are passed on to plot.  See plot for more information.
 
         See matplotlib.dates for helper functions date2num, num2date
         and drange for help on creating the required floating point dates
-
-        tz is the timezone - defaults to rc value
         """
 
         if not matplotlib._havedate:
             raise SystemExit('plot_date: no dates support - dates require python2.3')
 
         if not self._hold: self.cla()
 
-        ret = self.plot(d, y, fmt, **kwargs)
-
-        span  = self.dataLim.intervalx().span()
+        ret = self.plot(x, y, fmt, **kwargs)
 
-        locator, formatter = date_ticker_factory(span, tz)
-        self.xaxis.set_major_locator(locator)
-        self.xaxis.set_major_formatter(formatter)
+        if xdate:
+            self.xaxis_date(tz)
+        if ydate:
+            self.yaxis_date(tz)
+            
         self.autoscale_view()
 
         return ret
@@ -3586,6 +3596,27 @@ def vlines(self, x, ymin, ymax, fmt='k-', **kwargs):
             lines.append(line)
         return lines
 
+    def xaxis_date(self, tz=None):
+        """Sets up x-axis ticks and labels that treat the x data as dates.
+        
+        tz is the time zone to use in labeling dates.  Defaults to rc value.
+        """
+
+        span  = self.dataLim.intervalx().span()
+        locator, formatter = date_ticker_factory(span, tz)
+        self.xaxis.set_major_locator(locator)
+        self.xaxis.set_major_formatter(formatter)
+
+    def yaxis_date(self, tz=None):
+        """Sets up y-axis ticks and labels that treat the y data as dates.
+        
+        tz is the time zone to use in labeling dates.  Defaults to rc value.
+        """
+        
+        span  = self.dataLim.intervaly().span()
+        locator, formatter = date_ticker_factory(span, tz)
+        self.yaxis.set_major_locator(locator)
+        self.yaxis.set_major_formatter(formatter)
 
     def zoomx(self, numsteps):
         'Zoom in on the x xaxis numsteps (plus for zoom in, minus for zoom out)'

lib/matplotlib/font_manager.py

@@ -33,7 +33,7 @@
             see license/LICENSE_TTFQUERY.
 """
 
-import os, sys, glob, warnings
+import os, sys, glob, warnings, shutil
 import matplotlib
 from matplotlib import afm
 from matplotlib import ft2font
@@ -811,7 +811,7 @@ def __init__(self, size=12.0, weight='normal'):
         ttfcache = os.path.join(get_configdir(), 'ttffont.cache')
         if os.path.exists(oldcache):
             print >> sys.stderr, 'Moving old ttfcache location "%s" to new location "%s"'%(oldcache, ttfcache)
-            os.rename(oldcache, ttfcache)
+            shutil.move(oldcache, ttfcache)
 
 
 

lib/matplotlib/texmanager.py

@@ -60,7 +60,7 @@ class TexManager:
         print >> sys.stderr, """\
 WARNING: found a TeX cache dir in the deprecated location "%s".
   Moving it to the new default location "%s"."""%(oldcache, texcache)
-        os.rename(oldcache, texcache)
+        shutil.move(oldcache, texcache)
 
     dvipngVersion = None
 
@@ -80,7 +80,7 @@ def get_tex_command(self, tex, fname):
 
         fontcmd = {'sans-serif' : r'{\sffamily %s}',
                    'monospace'  : r'{\ttfamily %s}'}.get(
-        rcParams['font.family'],r'{\rmfamily %s}')
+            rcParams['font.family'], r'{\rmfamily %s}')
         tex = fontcmd % tex
         fh = file(fname, 'w')
         if rcParams['text.tex.engine'] == 'latex':
@@ -129,7 +129,7 @@ def make_dvi(self, tex, force=0):
         # if not in TEXMFOUTPUT.  So check for existence in current
         # dir and move it if necessary and then cleanup
         if os.path.exists(dvibase):
-            os.rename(dvibase, dvifile)
+            shutil.move(dvibase, dvifile)
             for fname in glob.glob(prefix+'*'):
                 os.remove(fname)
         return dvifile
@@ -308,20 +308,19 @@ def get_rgba(self, tex, fontsize=10, dpi=80, rgb=(0,0,0)):
 
             vers = self.get_dvipng_version()
             if vers<'1.6':
+                # hack the alpha channel as described in comment above
                 alpha = sqrt(1-X[:,:,0])
             else:
-                # 1.6 has the alpha channel right
+                # dvipng 1.6 and above handles the alpha channel
+                # properly
                 alpha = sqrt(X[:,:,-1])
 
-            #from matplotlib.mlab import prctile
-            #print 'ptile', prctile(ravel(X[:,:,0])), prctile(ravel(X[:,:,-1]))
 
             Z = zeros(X.shape, Float)
             Z[:,:,0] = r
             Z[:,:,1] = g
             Z[:,:,2] = b
             Z[:,:,3] = alpha
-            #im = fromarray(Z, 1)
 
             self.arrayd[key] = Z
         return Z

setupext.py

@@ -102,6 +102,7 @@ def add_base_flags(module):
     libdirs = [os.path.join(p, 'lib')     for p in basedir[sys.platform]
                if os.path.exists(p)]
     module.include_dirs.extend(incdirs)
+    module.include_dirs.append('.')    
     module.library_dirs.extend(libdirs)
 
 
@@ -169,6 +170,16 @@ def add_pygtk_flags(module):
         module.include_dirs.extend(
             ['win32_static/include/pygtk-2.0',
              'C:/GTK/include',
+             'C:/GTK/include/gobject',
+             'C:/GTK/include/gmodule',                          
+             'C:/GTK/include/glib',
+             'C:/GTK/include/pango',                          
+             'C:/GTK/include/atk',
+             'C:/GTK/include/X11',                          
+             'C:/GTK/include/cairo',             
+             'C:/GTK/include/gdk',
+             'C:/GTK/include/gdk-pixbuf',
+             'C:/GTK/include/gtk',                          
              ])
 
     add_base_flags(module)

src/_backend_agg.h

@@ -25,7 +25,7 @@
 #include "agg_pixfmt_rgb.h"
 #include "agg_pixfmt_rgba.h"
 #include "agg_rasterizer_outline.h"
-#include "agg_rasterizer_scanline_aa.h"
+#include "agg_rasterizer_aa.h"
 #include "agg_renderer_outline_aa.h"
 #include "agg_renderer_raster_text.h"
 #include "agg_renderer_scanline.h"