NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.4k

Commit9572d60

committed

Update & deprecate mpl_toolkits.{gtk,excel}tools.

- On Py2, np.rec.fromarrays cannot take a unicode string as names (butthis module __future__-imports unicode_strings).- CallbackRegistry ctor signature has changed.

1 parentc489bff commit9572d60Copy full SHA for 9572d60

File tree

2 files changed

+12

-11

lines changed

lib/mpl_toolkits
- exceltools.py
- gtktools.py

2 files changed

+12

-11

lines changed

`‎lib/mpl_toolkits/exceltools.py`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,10 @@`
`33`	`33`	`importmatplotlib.mlabasmlab`
`34`	`34`
`35`	`35`
	`36`	`+cbook.warn_deprecated("2.0",name="mpl_toolkits.exceltools",`
	`37`	`+alternative="openpyxl",obj_type="module")`
	`38`	`+`
	`39`	`+`
`36`	`40`	`defxlformat_factory(format):`
`37`	`41`	`"""`
`38`	`42`	`copy the format, perform any overrides, and attach an xlstyle instance`

`‎lib/mpl_toolkits/gtktools.py`

Lines changed: 8 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,15 @@`
`39`	`39`
`40`	`40`	`importcopy`
`41`	`41`	`importgtk,gobject`
`42`		`-importnumpyasnpy`
	`42`	`+importnumpyasnp`
`43`	`43`	`importmatplotlib.cbookascbook`
	`44`	`+frommatplotlib.cbookimportwarn_deprecated`
`44`	`45`	`importmatplotlib.mlabasmlab`
`45`	`46`
`46`	`47`
	`48`	`+warn_deprecated("2.0",name="mpl_toolkits.gtktools",obj_type="module")`
	`49`	`+`
	`50`	`+`
`47`	`51`	`deferror_message(msg,parent=None,title=None):`
`48`	`52`	`"""`
`49`	`53`	`create an error message dialog with string msg. Optionally set`
`@@ -164,7 +168,7 @@ def __call__(self, column):`
`164`	`168`	`val=model.get_value(thisiter,self.i)`
`165`	`169`	`try:val=float(val.strip().rstrip('%'))`
`166`	`170`	`exceptValueError:pass`
`167`		`-ifmlab.safe_isnan(val):val=npy.inf# force nan to sort uniquely`
	`171`	`+ifmlab.safe_isnan(val):val=np.inf# force nan to sort uniquely`
`168`	`172`	`dsu.append((val,rownum))`
`169`	`173`	`dsu.sort()`
`170`	`174`	`ifnotself.num%2:dsu.reverse()`
`@@ -326,19 +330,15 @@ def rec2gtk(r, formatd=None, rownum=0, autowin=True):`
`326`	`330`	`format=formatd.get(name)`
`327`	`331`	`ifformatisNone:`
`328`	`332`	`format=mlab.defaultformatd.get(dt.type,mlab.FormatObj())`
`329`		`-#print 'gtk fmt factory', i, name, format, type(format)`
`330`	`333`	`format=gtkformat_factory(format,i)`
`331`	`334`	`formatd[name]=format`
`332`	`335`
`333`		`-`
`334`	`336`	`colheaders=r.dtype.names`
`335`	`337`	`scroll=SortedStringsScrolledWindow(colheaders,formatd)`
`336`	`338`
`337`		`-ind=npy.arange(len(r.dtype.names))`
`338`	`339`	`forrowinr:`
`339`	`340`	`scroll.add_row(row)`
`340`	`341`
`341`		`-`
`342`	`342`	`ifautowin:`
`343`	`343`	`win=gtk.Window()`
`344`	`344`	`win.set_default_size(800,600)`
`@@ -387,7 +387,7 @@ def __init__(self, r, formatd=None, stringd=None):`
`387`	`387`	`formatd=mlab.get_formatd(r)`
`388`	`388`
`389`	`389`	`self.stringd=stringd`
`390`		`-self.callbacks=cbook.CallbackRegistry(['cell_changed'])`
	`390`	`+self.callbacks=cbook.CallbackRegistry()`
`391`	`391`
`392`	`392`	`self.r=r`
`393`	`393`
`@@ -586,9 +586,6 @@ def edit_recarray(r, formatd=None, stringd=None, constant=None, autowin=True):`
`586`	`586`	`if__name__=='__main__':`
`587`	`587`
`588`	`588`	`importdatetime`
`589`		`-importgtk`
`590`		`-importnumpyasnp`
`591`		`-importmatplotlib.mlabasmlab`
`592`	`589`	`N=10`
`593`	`590`	`today=datetime.date.today()`
`594`	`591`	`dates= [today+datetime.timedelta(days=i)foriinrange(N)]# datetimes`
`@@ -599,7 +596,7 @@ def edit_recarray(r, formatd=None, stringd=None, constant=None, autowin=True):`
`599`	`596`	`clientid=list(xrange(N))# ints`
`600`	`597`
`601`	`598`	`r=np.rec.fromarrays([clientid,dates,weekdays,gains,prices,up],`
`602`		`-names='clientid,date,weekdays,gains,prices,up')`
	`599`	`+names=str('clientid,date,weekdays,gains,prices,up'))`
`603`	`600`
`604`	`601`	`# some custom formatters`
`605`	`602`	`formatd=mlab.get_formatd(r)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit9572d60

File tree

2 files changed

2 files changed

`‎lib/mpl_toolkits/exceltools.py`

`‎lib/mpl_toolkits/gtktools.py`

0 commit comments