maybe_upcast_putmask: require other to be a scalar#29332

jreback merged 1 commit intopandas-dev:masterpandas-dev/pandas:masterfrom

jbrockmendel:maybe_upcastjbrockmendel/pandas:maybe_upcastCopy head branch name to clipboard