Revision: 7747
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7747&view=rev
Author: jdh2358
Date: 2009-09-11 21:02:27 +0000 (Fri, 11 Sep 2009)
Log Message:
-----------
some docstring cleanup on recs_join and align_iterators
Modified Paths:
--------------
trunk/matplotlib/lib/matplotlib/cbook.py
trunk/matplotlib/lib/matplotlib/mlab.py
trunk/matplotlib/make.osx
Modified: trunk/matplotlib/lib/matplotlib/cbook.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/cbook.py 2009-09-11 20:58:27 UTC (rev
7746)
+++ trunk/matplotlib/lib/matplotlib/cbook.py 2009-09-11 21:02:27 UTC (rev
7747)
@@ -390,7 +390,7 @@
for url, (fn, x, y) in cache.items():
if not os.path.isabs(fn):
cache[url] = (self.in_cache_dir(fn), x, y)
-
+
# If any files are deleted, drop them from the cache
for url, (fn, _, _) in cache.items():
if not os.path.exists(fn):
@@ -525,7 +525,7 @@
msg = 'file %s not in cache; received %s when trying to retrieve' \
% (fname, error)
raise KeyError(msg)
-
+
fname = cached[0]
if asfileobj:
@@ -1627,12 +1627,14 @@
return mlab.quad2cubic(q0x, q0y, q1x, q1y, q2x, q2y)
def align_iterators(func, *iterables):
- """
- This generator takes a bunch of iterables that are ordered by func
- It sends out ordered tuples (func(row), [rows from all iterators
matching func(row)])
-
- It is used by mlab.recs_join to join record arrays
"""
+ This generator takes a bunch of iterables that are ordered by func
+ It sends out ordered tuples:
+
+ (func(row), [rows from all iterators matching func(row)])
+
+ It is used by :func:`matplotlib.mlab.recs_join` to join record arrays
+ """
class myiter:
def __init__(self, it):
self.it = it
Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py 2009-09-11 20:58:27 UTC (rev
7746)
+++ trunk/matplotlib/lib/matplotlib/mlab.py 2009-09-11 21:02:27 UTC (rev
7747)
@@ -1884,16 +1884,27 @@
return newrec
def recs_join(key, name, recs,missing=0.):
- """
- *key* is the column name that acts as a key
- *name* is the name that we want to join
- *missing" is what the missing fields are replaced by
- *recarrays* is a list of record arrays to join
+ """
+ Join a sequence of record arrays on key
+ *key*
+ is the column name that acts as a key
+
+ *name*
+ is the name that we want to join
+
+ *missing"
+ is what the missing fields are replaced by
+
+ *recarrays*
+ is a list of record arrays to join
+
returns a record array with columns [rowkey, name1, name2, ... namen]
- >>> r = recs_join("date", "close", recs=[r0, r1], missing=0.)
+ Example::
+ r = recs_join("date", "close", recs=[r0, r1], missing=0.)
+
"""
results = []
def extract(r):
Modified: trunk/matplotlib/make.osx
===================================================================
--- trunk/matplotlib/make.osx 2009-09-11 20:58:27 UTC (rev 7746)
+++ trunk/matplotlib/make.osx 2009-09-11 21:02:27 UTC (rev 7747)
@@ -61,7 +61,7 @@
cd freetype-${FREETYPEVERSION} &&\
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS_DEPS} &&\
- export LDFLAGS=${LDFLAGS_DEPS} &&\
+ export LDFLAGS=${LDFLAGS_DEPS} &&\python/svn/bison/scripts/
./configure --prefix=${PREFIX} &&\
make -j3 install &&\
cp objs/.libs/libfreetype.a . &&\
@@ -76,8 +76,6 @@
export MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} &&\
export CFLAGS=${CFLAGS_DEPS} &&\
export LDFLAGS=${LDFLAGS_DEPS} &&\
- export LD_LIBRARY_PATH=${PREFIX}/lib &&\
- export DYLD_LIBRARY_PATH=${PREFIX}/lib &&\
python setup.py build
mpl_install:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
