Commit31dbef6

committed

cleanup _plot_args_replacer logic

1 parent5669261 commit31dbef6Copy full SHA for 31dbef6

File tree

+17

-8

lines changed

+17

-8

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1529,6 +1529,9 @@ def _replacer(data, key):`
`1529`	`1529`	`following arguments are replaced by data[<arg>]:`
`1530`	`1530`
`1531`	`1531`	`{replaced}`
	`1532`	`+`
	`1533`	+ Objects passed as data must support item access (``data[<arg>]``) and
	`1534`	+ membership test (``<arg> in data``).
`1532`	`1535`	`"""`
`1533`	`1536`
`1534`	`1537`
`@@ -1554,7 +1557,7 @@ def _add_data_doc(docstring, replace_names, replace_all_args):`
`1554`	`1557`	`ifdocstringisNone:`
`1555`	`1558`	`docstring=''`
`1556`	`1559`	`else:`
`1557`		`-docstring=dedent(docstring)`
	`1560`	`+docstring=dedent(docstring)git`
`1558`	`1561`	`_repl=""`
`1559`	`1562`	`ifreplace_namesisNone:`
`1560`	`1563`	`_repl="* All positional and all keyword arguments."`

Lines changed: 13 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,18 +44,24 @@`
`44`	`44`	`rcParams=matplotlib.rcParams`
`45`	`45`
`46`	`46`
	`47`	`+def_has_item(data,name):`
	`48`	`+"""Return whether data can be item-accessed with name.`
	`49`	`+`
	`50`	+ This supports data with a dict-like interface (`in` checks item
	`51`	`+ availability) and with numpy.arrays.`
	`52`	`+ """`
	`53`	`+try:`
	`54`	`+returnnameindataornameindata.dtype.names`
	`55`	`+except (AttributeError,TypeError):`
	`56`	`+returnFalse`
	`57`	`+`
	`58`	`+`
`47`	`59`	`def_plot_args_replacer(args,data):`
`48`	`60`	`iflen(args)==1:`
`49`	`61`	`return ["y"]`
`50`	`62`	`eliflen(args)==2:`
`51`	`63`	`# this can be two cases: x,y or y,c`
`52`		`-if (notargs[1]indataand`
`53`		`-not (hasattr(data,'dtype')and`
`54`		`-hasattr(data.dtype,'names')and`
`55`		`-data.dtype.namesisnotNoneand`
`56`		`-args[1]indata.dtype.names)):`
`57`		`-# this is not in data, so just assume that it is something which`
`58`		`-# will not get replaced (color spec or array like).`
	`64`	`+ifnot_has_item(data,args[1]):`
`59`	`65`	`return ["y","c"]`
`60`	`66`	`# it's data, but could be a color code like 'ro' or 'b--'`
`61`	`67`	`# -> warn the user in that case...`

Comments

(0)