Formed in 2009, the Archive Team (not to be confused with the archive.org Archive-It Team) is a rogue archivist collective dedicated to saving copies of rapidly dying or deleted websites for the sake of history and digital heritage. The group is 100% composed of volunteers and interested parties, and has expanded into a large amount of related projects for saving online and digital history.
bpo-20825: Containment test for ip_network in ip_network. Patch by Michel Albert. #4065
Conversation
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
pitrou
reviewed
Oct 21, 2017
Lib/ipaddress.py
Outdated
| return (self.network_address.is_multicast and | ||
| self.broadcast_address.is_multicast) | ||
|
|
||
| def _containment_check(self, check, other): |
There was a problem hiding this comment.
Instead of switching on check, how about having something like:
@classmethod
def _is_subnet_of(cls, a, b):
# Implementation here
def subnet_of(self, other):
return self._is_subnet_of(self, other)
def supernet_of(self, other):
return self._is_subnet_of(other, self)There was a problem hiding this comment.
Thank you. I made these changes, except I made is_subnet_of a staticmethod since it didn't use cls.
pitrou
reviewed
Oct 21, 2017
Lib/ipaddress.py
Outdated
| raise TypeError("{} and {} are not of the same version" | ||
| .format(a, b)) | ||
| # Dealing with another network. | ||
| if hasattr(b, 'network_address') and hasattr(b, 'broadcast_address'): |
There was a problem hiding this comment.
Since _is_subnet_of can be called both ways, you should also test the type for a.
|
Note the CI failures are unrelated. An external NNTP server we use in our test suite seems to have issues... |
|
I took the liberty of making small last-minute changes. Now I'm waiting for CI results again :-) |
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Patch by Michel Albert.
https://bugs.python.org/issue20825