Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 21, 2016

Conversation

mhvk
Copy link
Contributor

@mhvk mhvk commented Feb 21, 2016

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
Copy link
Member

charris commented Feb 21, 2016

@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
Copy link
Contributor Author

mhvk commented Feb 21, 2016

@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
Copy link
Member

charris commented Feb 21, 2016

@ahaldane Could you take a look also?

@charris charris added this to the 1.11.0 release milestone Feb 21, 2016
@ahaldane
Copy link
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
Copy link
Member

charris commented Feb 21, 2016

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
Copy link
Member

charris commented Feb 21, 2016

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