Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

PEP8 fixes on the tests of the dates module #1570

Merged
merged 1 commit into from

2 participants

@NelleV
Collaborator

Here is a quick PR with pep8 changes before I add some tests for this module.

Cheers,
N

@efiring efiring merged commit eba5ffd into matplotlib:master
@NelleV NelleV deleted the NelleV:test_date branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 7, 2012
  1. @NelleV
This page is out of date. Refresh to see the latest.
Showing with 70 additions and 52 deletions.
  1. +70 −52 lib/matplotlib/tests/test_dates.py
View
122 lib/matplotlib/tests/test_dates.py
@@ -1,68 +1,74 @@
from __future__ import print_function
import datetime
-import numpy as np
-from matplotlib.testing.decorators import image_comparison, knownfailureif, cleanup
+from matplotlib.testing.decorators import image_comparison
+from matplotlib.testing.decorators import knownfailureif, cleanup
import matplotlib.pyplot as plt
from nose.tools import assert_raises, assert_equal
import warnings
+
@image_comparison(baseline_images=['date_empty'])
def test_date_empty():
# make sure mpl does the right thing when told to plot dates even
# if no date data has been presented, cf
# http://sourceforge.net/tracker/?func=detail&aid=2850075&group_id=80706&atid=560720
fig = plt.figure()
- ax = fig.add_subplot(1,1,1)
+ ax = fig.add_subplot(1, 1, 1)
ax.xaxis_date()
+
@image_comparison(baseline_images=['date_axhspan'])
def test_date_axhspan():
# test ax hspan with date inputs
t0 = datetime.datetime(2009, 1, 20)
tf = datetime.datetime(2009, 1, 21)
fig = plt.figure()
- ax = fig.add_subplot(1,1,1)
- ax.axhspan( t0, tf, facecolor="blue", alpha=0.25 )
- ax.set_ylim(t0-datetime.timedelta(days=5),
- tf+datetime.timedelta(days=5))
+ ax = fig.add_subplot(1, 1, 1)
+ ax.axhspan(t0, tf, facecolor="blue", alpha=0.25)
+ ax.set_ylim(t0 - datetime.timedelta(days=5),
+ tf + datetime.timedelta(days=5))
fig.subplots_adjust(left=0.25)
+
@image_comparison(baseline_images=['date_axvspan'])
def test_date_axvspan():
# test ax hspan with date inputs
t0 = datetime.datetime(2000, 1, 20)
tf = datetime.datetime(2010, 1, 21)
fig = plt.figure()
- ax = fig.add_subplot(1,1,1)
- ax.axvspan( t0, tf, facecolor="blue", alpha=0.25 )
- ax.set_xlim(t0-datetime.timedelta(days=720),
- tf+datetime.timedelta(days=720))
+ ax = fig.add_subplot(1, 1, 1)
+ ax.axvspan(t0, tf, facecolor="blue", alpha=0.25)
+ ax.set_xlim(t0 - datetime.timedelta(days=720),
+ tf + datetime.timedelta(days=720))
fig.autofmt_xdate()
+
@image_comparison(baseline_images=['date_axhline'])
def test_date_axhline():
# test ax hline with date inputs
t0 = datetime.datetime(2009, 1, 20)
tf = datetime.datetime(2009, 1, 31)
fig = plt.figure()
- ax = fig.add_subplot(1,1,1)
- ax.axhline( t0, color="blue", lw=3)
- ax.set_ylim(t0-datetime.timedelta(days=5),
- tf+datetime.timedelta(days=5))
+ ax = fig.add_subplot(1, 1, 1)
+ ax.axhline(t0, color="blue", lw=3)
+ ax.set_ylim(t0 - datetime.timedelta(days=5),
+ tf + datetime.timedelta(days=5))
fig.subplots_adjust(left=0.25)
+
@image_comparison(baseline_images=['date_axvline'])
def test_date_axvline():
# test ax hline with date inputs
t0 = datetime.datetime(2000, 1, 20)
tf = datetime.datetime(2000, 1, 21)
fig = plt.figure()
- ax = fig.add_subplot(1,1,1)
- ax.axvline( t0, color="red", lw=3)
- ax.set_xlim(t0-datetime.timedelta(days=5),
- tf+datetime.timedelta(days=5))
+ ax = fig.add_subplot(1, 1, 1)
+ ax.axvline(t0, color="red", lw=3)
+ ax.set_xlim(t0 - datetime.timedelta(days=5),
+ tf + datetime.timedelta(days=5))
fig.autofmt_xdate()
+
@cleanup
def test_too_many_date_ticks():
# Attempt to test SF 2715172, see
@@ -70,19 +76,23 @@ def test_too_many_date_ticks():
# setting equal datetimes triggers and expander call in
# transforms.nonsingular which results in too many ticks in the
# DayLocator. This should trigger a Locator.MAXTICKS RuntimeError
- warnings.filterwarnings('ignore',
- 'Attempting to set identical left==right results\\nin singular transformations; automatically expanding.\\nleft=\d*\.\d*, right=\d*\.\d*',
+ warnings.filterwarnings(
+ 'ignore',
+ 'Attempting to set identical left==right results\\nin singular '
+ 'transformations; automatically expanding.\\nleft=\d*\.\d*, '
+ 'right=\d*\.\d*',
UserWarning, module='matplotlib.axes')
t0 = datetime.datetime(2000, 1, 20)
tf = datetime.datetime(2000, 1, 20)
fig = plt.figure()
- ax = fig.add_subplot(1,1,1)
- ax.set_xlim((t0,tf), auto=True)
- ax.plot([],[])
- from matplotlib.dates import DayLocator, DateFormatter, HourLocator
+ ax = fig.add_subplot(1, 1, 1)
+ ax.set_xlim((t0, tf), auto=True)
+ ax.plot([], [])
+ from matplotlib.dates import DayLocator
ax.xaxis.set_major_locator(DayLocator())
assert_raises(RuntimeError, fig.savefig, 'junk.png')
+
@image_comparison(baseline_images=['RRuleLocator_bounds'])
def test_RRuleLocator():
import pylab
@@ -95,22 +105,23 @@ def test_RRuleLocator():
# This will cause the RRuleLocator to go out of bounds when it tries
# to add padding to the limits, so we make sure it caps at the correct
# boundary values.
- t0 = datetime( 1000, 1, 1 )
- tf = datetime( 6000, 1, 1 )
+ t0 = datetime(1000, 1, 1)
+ tf = datetime(6000, 1, 1)
fig = pylab.figure()
- ax = pylab.subplot( 111 )
- ax.set_autoscale_on( True )
- ax.plot( [t0, tf], [0.0, 1.0], marker='o' )
+ ax = pylab.subplot(111)
+ ax.set_autoscale_on(True)
+ ax.plot([t0, tf], [0.0, 1.0], marker='o')
- rrule = mpldates.rrulewrapper( dateutil.rrule.YEARLY, interval=500 )
- locator = mpldates.RRuleLocator( rrule )
- ax.xaxis.set_major_locator( locator )
- ax.xaxis.set_major_formatter( mpldates.AutoDateFormatter(locator) )
+ rrule = mpldates.rrulewrapper(dateutil.rrule.YEARLY, interval=500)
+ locator = mpldates.RRuleLocator(rrule)
+ ax.xaxis.set_major_locator(locator)
+ ax.xaxis.set_major_formatter(mpldates.AutoDateFormatter(locator))
ax.autoscale_view()
fig.autofmt_xdate()
+
@image_comparison(baseline_images=['DateFormatter_fractionalSeconds'])
def test_DateFormatter():
import pylab
@@ -121,13 +132,13 @@ def test_DateFormatter():
# Lets make sure that DateFormatter will allow us to have tick marks
# at intervals of fractional seconds.
- t0 = datetime( 2001, 1, 1, 0, 0, 0 )
- tf = datetime( 2001, 1, 1, 0, 0, 1 )
+ t0 = datetime(2001, 1, 1, 0, 0, 0)
+ tf = datetime(2001, 1, 1, 0, 0, 1)
fig = pylab.figure()
- ax = pylab.subplot( 111 )
- ax.set_autoscale_on( True )
- ax.plot( [t0, tf], [0.0, 1.0], marker='o' )
+ ax = pylab.subplot(111)
+ ax.set_autoscale_on(True)
+ ax.plot([t0, tf], [0.0, 1.0], marker='o')
# rrule = mpldates.rrulewrapper( dateutil.rrule.YEARLY, interval=500 )
# locator = mpldates.RRuleLocator( rrule )
@@ -137,36 +148,42 @@ def test_DateFormatter():
ax.autoscale_view()
fig.autofmt_xdate()
+
def test_drange():
- '''This test should check if drange works as expected, and if all the rounding errors
- are fixed'''
+ """
+ This test should check if drange works as expected, and if all the
+ rounding errors are fixed
+ """
from matplotlib import dates
- start = datetime.datetime(2011, 1,1, tzinfo=dates.UTC)
+ start = datetime.datetime(2011, 1, 1, tzinfo=dates.UTC)
end = datetime.datetime(2011, 1, 2, tzinfo=dates.UTC)
delta = datetime.timedelta(hours=1)
- #We expect 24 values in drange(start, end, delta), because drange returns dates from
- #an half open interval [start, end)
+ # We expect 24 values in drange(start, end, delta), because drange returns
+ # dates from an half open interval [start, end)
assert_equal(24, len(dates.drange(start, end, delta)))
- #if end is a little bit later, we expect the range to contain one element more
- end = end +datetime.timedelta(microseconds=1)
+ # if end is a little bit later, we expect the range to contain one element
+ # more
+ end = end + datetime.timedelta(microseconds=1)
assert_equal(25, len(dates.drange(start, end, delta)))
- #reset end
+ # reset end
end = datetime.datetime(2011, 1, 2, tzinfo=dates.UTC)
- #and tst drange with "complicated" floats:
+ # and tst drange with "complicated" floats:
# 4 hours = 1/6 day, this is an "dangerous" float
delta = datetime.timedelta(hours=4)
daterange = dates.drange(start, end, delta)
assert_equal(6, len(daterange))
- assert_equal(dates.num2date(daterange[-1]), end-delta)
+ assert_equal(dates.num2date(daterange[-1]), end - delta)
+
#@image_comparison(baseline_images=['empty_date_bug'])
@cleanup
@knownfailureif(True)
def test_empty_date_with_year_formatter():
- # exposes sf bug 2861426: https://sourceforge.net/tracker/?func=detail&aid=2861426&group_id=80706&atid=560720
+ # exposes sf bug 2861426:
+ # https://sourceforge.net/tracker/?func=detail&aid=2861426&group_id=80706&atid=560720
# update: I am no loner believe this is a bug, as I commented on
# the tracker. The question is now: what to do with this test
@@ -181,6 +198,7 @@ def test_empty_date_with_year_formatter():
fig.savefig('empty_date_bug')
-if __name__=='__main__':
+
+if __name__ == '__main__':
import nose
- nose.runmodule(argv=['-s','--with-doctest'], exit=False)
+ nose.runmodule(argv=['-s', '--with-doctest'], exit=False)
Something went wrong with that request. Please try again.