Commitd87ac91

committed

Fix datetime mess

1 parent95e4e52 commitd87ac91Copy full SHA for d87ac91

File tree

+29

-21

lines changed

+29

-21

lines changed

Lines changed: 12 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -411,19 +411,24 @@ def date2num(d):`
`411`	`411`	`For details see the module docstring.`
`412`	`412`	`"""`
`413`	`413`
`414`		`-ifhasattr(d,"values"):`
`415`		`-# this unpacks pandas series or dataframes...`
`416`		`-d=d.values`
`417`		`-`
`418`		`-if ((isinstance(d,np.ndarray)andnp.issubdtype(d.dtype,np.datetime64))`
`419`		`-orisinstance(d,np.datetime64)):`
`420`		`-return_dt64_to_ordinalf(d)`
`421`	`414`	`ifnotcbook.iterable(d):`
	`415`	`+ifhasattr(d,'dtype'):`
	`416`	`+if (np.issubdtype(d.dtype,np.datetime64)or`
	`417`	`+isinstance(d,np.datetime64)):`
	`418`	`+return_dt64_to_ordinalf(d)`
`422`	`419`	`return_to_ordinalf(d)`
`423`	`420`	`else:`
`424`	`421`	`d=np.asarray(d)`
	`422`	`+# note that this unpacks anything that has a numpy array in it`
	`423`	`+# and just returns the array. So this strips the array out of`
	`424`	`+# a pandas series object, for instance.`
`425`	`425`	`ifnotd.size:`
`426`	`426`	`returnd`
	`427`	`+ifhasattr(d,'dtype'):`
	`428`	`+if ((isinstance(d,np.ndarray)and`
	`429`	`+np.issubdtype(d.dtype,np.datetime64))or`
	`430`	`+isinstance(d,np.datetime64)):`
	`431`	`+return_dt64_to_ordinalf(d)`
`427`	`432`	`return_to_ordinalf_np_vectorized(d)`
`428`	`433`
`429`	`434`

Lines changed: 4 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,17 +82,8 @@ def pd():`
`82`	`82`	`pd=pytest.importorskip('pandas')`
`83`	`83`	`try:`
`84`	`84`	`frompandas.plottingimport (`
`85`		`-register_matplotlib_convertersasregister)`
	`85`	`+deregister_matplotlib_convertersasderegister)`
	`86`	`+deregister()`
`86`	`87`	`exceptImportError:`
`87`		`-frompandas.tseries.converterimportregister`
`88`		`-register()`
`89`		`-try:`
`90`		`-yieldpd`
`91`		`-finally:`
`92`		`-try:`
`93`		`-frompandas.plottingimport (`
`94`		`-deregister_matplotlib_convertersasderegister)`
`95`		`-exceptImportError:`
`96`		`-pass`
`97`		`-else:`
`98`		`-deregister()`
	`88`	`+pass`
	`89`	`+returnpd`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5257,6 +5257,18 @@ def test_pandas_bar_align_center(pd):`
`5257`	`5257`	`fig.canvas.draw()`
`5258`	`5258`
`5259`	`5259`
	`5260`	`+deftest_pandas_data_unpack(pd):`
	`5261`	`+# smoke test for all these different calling methods.`
	`5262`	`+dates= [datetime.datetime(2018,7,i)foriinrange(1,5)]`
	`5263`	`+values=np.cumsum(np.random.rand(len(dates)))`
	`5264`	`+df=pd.DataFrame({"dates":dates,"values":values})`
	`5265`	`+plt.plot(df["dates"].values,df["values"])`
	`5266`	`+plt.scatter(df["dates"],df["values"])`
	`5267`	`+plt.plot("dates","values",data=df)`
	`5268`	`+plt.scatter(x="dates",y="values",data=df)`
	`5269`	`+plt.draw()`
	`5270`	`+`
	`5271`	`+`
`5260`	`5272`	`deftest_axis_set_tick_params_labelsize_labelcolor():`
`5261`	`5273`	`# Tests fix for issue 4346`
`5262`	`5274`	`axis_1=plt.subplot()`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,7 @@ def tz_convert(*args):`
`585`	`585`
`586`	`586`	`deftest_dateboxplot_pandas(pd):`
`587`	`587`	`# smoke test that this doesn't fail.`
`588`		`-data=np.random.rand(5,2)`
	`588`	`+data=np.random.rand(5,2)`
`589`	`589`	`years=pd.date_range('1/1/2000',`
`590`	`590`	`periods=2,freq=pd.DateOffset(years=1)).year`
`591`	`591`	`# Does not work`

Comments

(0)