Skip to content
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

Remove double definition of IPPROTO_IPV6 #100

Merged
merged 1 commit into from
Feb 14, 2017
Merged

Conversation

mhils
Copy link
Contributor

@mhils mhils commented Feb 14, 2017

IPPROTO_IPV6 is already defined at socketmodule.c#L7207 in the same way, this looks like a copy & paste oversight.

IPPROTO_IPV6 is already defined further above in the same way
Copy link
Member

@berkerpeksag berkerpeksag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, it was probably caused by a weird merge glitch.

@berkerpeksag berkerpeksag merged commit 5ec08ce into python:master Feb 14, 2017
@berkerpeksag
Copy link
Member

Thanks!

@mhils mhils deleted the patch-1 branch February 14, 2017 23:07
akruis pushed a commit to akruis/cpython that referenced this pull request Sep 9, 2017
…t_pickler

Adapt the test case to Stackless. Its C struct PicklerObject has an additional member.

https://bitbucket.org/stackless-dev/stackless/issues/100
akruis pushed a commit to akruis/cpython that referenced this pull request Sep 9, 2017
jaraco pushed a commit that referenced this pull request Dec 2, 2022
jaraco added a commit to jaraco/cpython that referenced this pull request Feb 17, 2023
jaraco added a commit to jaraco/cpython that referenced this pull request Feb 17, 2023
Remove __version__

Closes python#100

See merge request python-devs/importlib_resources!105
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants