-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Fixing deepcopy for Dataset.attrs #2839
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
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
8000575
Fixing deepcopy for Dataset.attrs + adjusting testcase
kefirbandi 73a2cab
removing extra newlines
kefirbandi 6926f5b
Updating whats-new
kefirbandi 5114beb
PEP8
kefirbandi 81aae2e
Adding attrs-test to the shallow copy testcase
kefirbandi 68455ca
Rename _attrs -> attrs
shoyer 7c983e0
Merge branch 'master' into master
shoyer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1885,6 +1885,7 @@ def test_drop_dims(self): | |
|
|
||
| def test_copy(self): | ||
| data = create_test_data() | ||
| data.attrs['Test'] = [1, 2, 3] | ||
|
|
||
| for copied in [data.copy(deep=False), copy(data)]: | ||
| assert_identical(data, copied) | ||
|
|
@@ -1899,12 +1900,18 @@ def test_copy(self): | |
| copied['foo'] = ('z', np.arange(5)) | ||
| assert 'foo' not in data | ||
|
|
||
| copied.attrs['foo'] = 'bar' | ||
| assert 'foo' not in data.attrs | ||
| assert data.attrs['Test'] is copied.attrs['Test'] | ||
|
|
||
| for copied in [data.copy(deep=True), deepcopy(data)]: | ||
| assert_identical(data, copied) | ||
| for k, v0 in data.variables.items(): | ||
| v1 = copied.variables[k] | ||
| assert v0 is not v1 | ||
|
|
||
| assert data.attrs['Test'] is not copied.attrs['Test'] | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can you also add a test for shallow copying? |
||
|
|
||
| def test_copy_with_data(self): | ||
| orig = create_test_data() | ||
| new_data = {k: np.random.randn(*v.shape) | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I made one small fix, renaming
_attrstoattrs.As a general rule, we use the underscore prefix in Python as a convention for "private" but technically public variables. This isn't necessary for local variables defined within the scope of a function, since these are already private.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right. Actually I first called it "new_attrs" but it was 3 characters above PEP8 line-length limit, so I removed the first 3... :)
Thanks for the fix.