Skip to content

Revert part of #3907 which incorrectly propogated MaskedArray info. - #7296

Merged
charris merged 1 commit into
numpy:masterfrom
mhvk:ma_ufuncs_subclasses
Feb 21, 2016
Merged

charris merged 1 commit into
numpy:masterfrom
mhvk:ma_ufuncs_subclasses

Conversation

@mhvk

@mhvk mhvk commented Feb 21, 2016

Copy link
Copy Markdown
Contributor

Closes #7122 (hopefully)

Basically, this restores previous behaviour. Arguably, the latter was not all that sane, but at least this is consistent, and should solve the regression reported in #7122

@charris

charris commented Feb 21, 2016

Copy link
Copy Markdown
Member

@mhvk I don't claim to understand the code, but thanks ;)

@mhvk
mhvk force-pushed the ma_ufuncs_subclasses branch from b640809 to c104112 Compare February 21, 2016 01:13
@mhvk

mhvk commented Feb 21, 2016

Copy link
Copy Markdown
Contributor Author

@charris - now also added a test case... Looking back, I think it is mostly that in my previous PR I didn't quite understand what the point of the various _update_from was; I updated from the result calculated based on just the data, which ignored any information stored on the masked array properly.

@charris

charris commented Feb 21, 2016

Copy link
Copy Markdown
Member

@ahaldane Could you take a look also?

@charris charris added this to the 1.11.0 release milestone Feb 21, 2016
@ahaldane

Copy link
Copy Markdown
Member

I haven't gone through the entire chain of changes following the PRs in history, but the changes in this PR at least make sense to me. It's just making update_from inherit the attributes from the input arrays correctly.

So even though I haven't exactly understood #3907 this PR looks good to me.

@charris

charris commented Feb 21, 2016

Copy link
Copy Markdown
Member

OK, let's give it a shot.

charris added a commit that referenced this pull request Feb 21, 2016
Revert part of #3907 which incorrectly propogated MaskedArray info.
@charris
charris merged commit 710ec56 into numpy:master Feb 21, 2016
@charris

charris commented Feb 21, 2016

Copy link
Copy Markdown
Member

Thanks Marten.

@homu homu mentioned this pull request Feb 21, 2016
@charris charris removed this from the 1.11.0 release milestone Feb 21, 2016
@mhvk
mhvk deleted the ma_ufuncs_subclasses branch February 19, 2017 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants