Skip to content

Commit 5a0ff9a

Browse files
jdh2358jdh2358
committed
new date handling
svn path=/trunk/matplotlib/; revision=536
1 parent 9bf2448 commit 5a0ff9a

File tree

12 files changed

+386
-90
lines changed

12 files changed

+386
-90
lines changed

‎.matplotlibrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ backend : GTKAgg # the default backend
2828
numerix : Numeric # Numeric or numarray
2929
interactive : False # see http://matplotlib.sourceforge.net/interactive.html
3030
toolbar : toolbar2 # None | classic | toolbar2
31-
31+
timezone : UTC # a pytz timezone string, eg US/Central or Europe/Paris
3232
# Where your matplotlib data lives if you installed to a non-default
3333
# location. This is where the matplotlib fonts, bitmaps, etc reside
3434
#datapath : /home/jdhunter/mpldata

‎CHANGELOG

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
New entries should be added at the top
22

33
==============================================================
4+
5+
2004-09-17 Total rewrite of dates handling to use python datetime with
6+
num2date, date2num and drange. pytz for timezone handling,
7+
dateutils for spohisticated ticking. date ranges from
8+
0001-9999 are supported. rrules allow arbitrary date
9+
ticking. examples/date_demo*.py converted to show new
10+
usage. new example examples/date_demo_rrule.py shows how
11+
to use rrules in date plots. The date locators are much
12+
more general and almost all of them have different
13+
constructors. See matplotlib.dates for more info.
14+
415
2004-09-15 Applied Fernando's backend __init__ patch to support easier
516
backend maintenance. Added his numutils to mlab. JDH
617

‎LICENSE/DATEUTIL_LICENSE.txt

Lines changed: 259 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,259 @@
1+
A. HISTORY OF THE SOFTWARE
2+
==========================
3+
4+
Python was created in the early 1990s by Guido van Rossum at Stichting
5+
Mathematisch Centrum (CWI, see http://www.cwi.nl) in the Netherlands
6+
as a successor of a language called ABC. Guido remains Python's
7+
principal author, although it includes many contributions from others.
8+
9+
In 1995, Guido continued his work on Python at the Corporation for
10+
National Research Initiatives (CNRI, see http://www.cnri.reston.va.us)
11+
in Reston, Virginia where he released several versions of the
12+
software.
13+
14+
In May 2000, Guido and the Python core development team moved to
15+
BeOpen.com to form the BeOpen PythonLabs team. In October of the same
16+
year, the PythonLabs team moved to Digital Creations (now Zope
17+
Corporation, see http://www.zope.com). In 2001, the Python Software
18+
Foundation (PSF, see http://www.python.org/psf/) was formed, a
19+
non-profit organization created specifically to own Python-related
20+
Intellectual Property. Zope Corporation is a sponsoring member of
21+
the PSF.
22+
23+
All Python releases are Open Source (see http://www.opensource.org for
24+
the Open Source Definition). Historically, most, but not all, Python
25+
releases have also been GPL-compatible; the table below summarizes
26+
the various releases.
27+
28+
Release Derived Year Owner GPL-
29+
from compatible? (1)
30+
31+
0.9.0 thru 1.2 1991-1995 CWI yes
32+
1.3 thru 1.5.2 1.2 1995-1999 CNRI yes
33+
1.6 1.5.2 2000 CNRI no
34+
2.0 1.6 2000 BeOpen.com no
35+
1.6.1 1.6 2001 CNRI yes (2)
36+
2.1 2.0+1.6.1 2001 PSF no
37+
2.0.1 2.0+1.6.1 2001 PSF yes
38+
2.1.1 2.1+2.0.1 2001 PSF yes
39+
2.2 2.1.1 2001 PSF yes
40+
2.1.2 2.1.1 2002 PSF yes
41+
2.1.3 2.1.2 2002 PSF yes
42+
2.2.1 2.2 2002 PSF yes
43+
2.2.2 2.2.1 2002 PSF yes
44+
2.2.3 2.2.2 2003 PSF yes
45+
2.3 2.2.2 2002-2003 PSF yes
46+
47+
Footnotes:
48+
49+
(1) GPL-compatible doesn't mean that we're distributing Python under
50+
the GPL. All Python licenses, unlike the GPL, let you distribute
51+
a modified version without making your changes open source. The
52+
GPL-compatible licenses make it possible to combine Python with
53+
other software that is released under the GPL; the others don't.
54+
55+
(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
56+
because its license has a choice of law clause. According to
57+
CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
58+
is "not incompatible" with the GPL.
59+
60+
Thanks to the many outside volunteers who have worked under Guido's
61+
direction to make these releases possible.
62+
63+
64+
B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
65+
===============================================================
66+
67+
PSF LICENSE AGREEMENT FOR PYTHON 2.3
68+
------------------------------------
69+
70+
1. This LICENSE AGREEMENT is between the Python Software Foundation
71+
("PSF"), and the Individual or Organization ("Licensee") accessing and
72+
otherwise using Python 2.3 software in source or binary form and its
73+
associated documentation.
74+
75+
2. Subject to the terms and conditions of this License Agreement, PSF
76+
hereby grants Licensee a nonexclusive, royalty-free, world-wide
77+
license to reproduce, analyze, test, perform and/or display publicly,
78+
prepare derivative works, distribute, and otherwise use Python 2.3
79+
alone or in any derivative version, provided, however, that PSF's
80+
License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
81+
2001, 2002, 2003 Python Software Foundation; All Rights Reserved" are
82+
retained in Python 2.3 alone or in any derivative version prepared by
83+
Licensee.
84+
85+
3. In the event Licensee prepares a derivative work that is based on
86+
or incorporates Python 2.3 or any part thereof, and wants to make
87+
the derivative work available to others as provided herein, then
88+
Licensee hereby agrees to include in any such work a brief summary of
89+
the changes made to Python 2.3.
90+
91+
4. PSF is making Python 2.3 available to Licensee on an "AS IS"
92+
basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
93+
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
94+
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
95+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.3 WILL NOT
96+
INFRINGE ANY THIRD PARTY RIGHTS.
97+
98+
5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
99+
2.3 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
100+
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.3,
101+
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
102+
103+
6. This License Agreement will automatically terminate upon a material
104+
breach of its terms and conditions.
105+
106+
7. Nothing in this License Agreement shall be deemed to create any
107+
relationship of agency, partnership, or joint venture between PSF and
108+
Licensee. This License Agreement does not grant permission to use PSF
109+
trademarks or trade name in a trademark sense to endorse or promote
110+
products or services of Licensee, or any third party.
111+
112+
8. By copying, installing or otherwise using Python 2.3, Licensee
113+
agrees to be bound by the terms and conditions of this License
114+
Agreement.
115+
116+
117+
BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
118+
-------------------------------------------
119+
120+
BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
121+
122+
1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
123+
office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
124+
Individual or Organization ("Licensee") accessing and otherwise using
125+
this software in source or binary form and its associated
126+
documentation ("the Software").
127+
128+
2. Subject to the terms and conditions of this BeOpen Python License
129+
Agreement, BeOpen hereby grants Licensee a non-exclusive,
130+
royalty-free, world-wide license to reproduce, analyze, test, perform
131+
and/or display publicly, prepare derivative works, distribute, and
132+
otherwise use the Software alone or in any derivative version,
133+
provided, however, that the BeOpen Python License is retained in the
134+
Software, alone or in any derivative version prepared by Licensee.
135+
136+
3. BeOpen is making the Software available to Licensee on an "AS IS"
137+
basis. BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
138+
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
139+
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
140+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
141+
INFRINGE ANY THIRD PARTY RIGHTS.
142+
143+
4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
144+
SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
145+
AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
146+
DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
147+
148+
5. This License Agreement will automatically terminate upon a material
149+
breach of its terms and conditions.
150+
151+
6. This License Agreement shall be governed by and interpreted in all
152+
respects by the law of the State of California, excluding conflict of
153+
law provisions. Nothing in this License Agreement shall be deemed to
154+
create any relationship of agency, partnership, or joint venture
155+
between BeOpen and Licensee. This License Agreement does not grant
156+
permission to use BeOpen trademarks or trade names in a trademark
157+
sense to endorse or promote products or services of Licensee, or any
158+
third party. As an exception, the "BeOpen Python" logos available at
159+
http://www.pythonlabs.com/logos.html may be used according to the
160+
permissions granted on that web page.
161+
162+
7. By copying, installing or otherwise using the software, Licensee
163+
agrees to be bound by the terms and conditions of this License
164+
Agreement.
165+
166+
167+
CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
168+
---------------------------------------
169+
170+
1. This LICENSE AGREEMENT is between the Corporation for National
171+
Research Initiatives, having an office at 1895 Preston White Drive,
172+
Reston, VA 20191 ("CNRI"), and the Individual or Organization
173+
("Licensee") accessing and otherwise using Python 1.6.1 software in
174+
source or binary form and its associated documentation.
175+
176+
2. Subject to the terms and conditions of this License Agreement, CNRI
177+
hereby grants Licensee a nonexclusive, royalty-free, world-wide
178+
license to reproduce, analyze, test, perform and/or display publicly,
179+
prepare derivative works, distribute, and otherwise use Python 1.6.1
180+
alone or in any derivative version, provided, however, that CNRI's
181+
License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
182+
1995-2001 Corporation for National Research Initiatives; All Rights
183+
Reserved" are retained in Python 1.6.1 alone or in any derivative
184+
version prepared by Licensee. Alternately, in lieu of CNRI's License
185+
Agreement, Licensee may substitute the following text (omitting the
186+
quotes): "Python 1.6.1 is made available subject to the terms and
187+
conditions in CNRI's License Agreement. This Agreement together with
188+
Python 1.6.1 may be located on the Internet using the following
189+
unique, persistent identifier (known as a handle): 1895.22/1013. This
190+
Agreement may also be obtained from a proxy server on the Internet
191+
using the following URL: http://hdl.handle.net/1895.22/1013".
192+
193+
3. In the event Licensee prepares a derivative work that is based on
194+
or incorporates Python 1.6.1 or any part thereof, and wants to make
195+
the derivative work available to others as provided herein, then
196+
Licensee hereby agrees to include in any such work a brief summary of
197+
the changes made to Python 1.6.1.
198+
199+
4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
200+
basis. CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
201+
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
202+
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
203+
FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
204+
INFRINGE ANY THIRD PARTY RIGHTS.
205+
206+
5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
207+
1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
208+
A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
209+
OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
210+
211+
6. This License Agreement will automatically terminate upon a material
212+
breach of its terms and conditions.
213+
214+
7. This License Agreement shall be governed by the federal
215+
intellectual property law of the United States, including without
216+
limitation the federal copyright law, and, to the extent such
217+
U.S. federal law does not apply, by the law of the Commonwealth of
218+
Virginia, excluding Virginia's conflict of law provisions.
219+
Notwithstanding the foregoing, with regard to derivative works based
220+
on Python 1.6.1 that incorporate non-separable material that was
221+
previously distributed under the GNU General Public License (GPL), the
222+
law of the Commonwealth of Virginia shall govern this License
223+
Agreement only as to issues arising under or with respect to
224+
Paragraphs 4, 5, and 7 of this License Agreement. Nothing in this
225+
License Agreement shall be deemed to create any relationship of
226+
agency, partnership, or joint venture between CNRI and Licensee. This
227+
License Agreement does not grant permission to use CNRI trademarks or
228+
trade name in a trademark sense to endorse or promote products or
229+
services of Licensee, or any third party.
230+
231+
8. By clicking on the "ACCEPT" button where indicated, or by copying,
232+
installing or otherwise using Python 1.6.1, Licensee agrees to be
233+
bound by the terms and conditions of this License Agreement.
234+
235+
ACCEPT
236+
237+
238+
CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
239+
--------------------------------------------------
240+
241+
Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
242+
The Netherlands. All rights reserved.
243+
244+
Permission to use, copy, modify, and distribute this software and its
245+
documentation for any purpose and without fee is hereby granted,
246+
provided that the above copyright notice appear in all copies and that
247+
both that copyright notice and this permission notice appear in
248+
supporting documentation, and that the name of Stichting Mathematisch
249+
Centrum or CWI not be used in advertising or publicity pertaining to
250+
distribution of the software without specific, written prior
251+
permission.
252+
253+
STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
254+
THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
255+
FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
256+
FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
257+
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
258+
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
259+
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

‎LICENSE/PYTZ_LICENSE.txt

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
Copyright (c) 2003-2004 Stuart Bishop <stuart@stuartbishop.net>
2+
All rights reserved.
3+
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are
6+
met:
7+
8+
Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
11+
Redistributions in binary form must reproduce the above copyright
12+
notice, this list of conditions and the following disclaimer in the
13+
documentation and/or other materials provided with the
14+
distribution.
15+
16+
The name of Stuart Bishop may not be used to endorse or promote
17+
products derived from this software without specific prior written
18+
permission.
19+
20+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21+
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
23+
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
24+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
25+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
26+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
27+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
28+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
29+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
30+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31+

‎MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ prune examples/_tmp_*
1414
recursive-include src *.cpp *.c *.h
1515
recursive-include CXX *.cxx *.hxx *.c
1616
recursive-include agg2 *
17+
recursive-include pytz *
18+
recursive-include dateutil *

‎TODO

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,4 +575,8 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
575575

576576
-- file save dialog for Tk? See Mayavi for the right call to make.
577577

578-
-- colorbar for dynamic images.
578+
-- colorbar for dynamic images.
579+
580+
-- Finish the coords notification for all backends
581+
582+
-- ro an rrulewrapper demo

0 commit comments

Comments
 (0)