FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Remove double definition of IPPROTO_IPV6 by mhils · Pull Request #100 · python/cpython · GitHub

Repository navigation

Remove double definition of IPPROTO_IPV6 - #100

Merged
berkerpeksag merged 1 commit into
python:masterfrom
mhils:patch-1
Feb 14, 2017
Merged

berkerpeksag merged 1 commit into
python:masterfrom
mhils:patch-1

Conversation

mhils commented Feb 14, 2017

Copy link
Copy Markdown
Contributor

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

berkerpeksag left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

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

berkerpeksag merged commit 5ec08ce into python:master Feb 14, 2017

Copy link
Copy Markdown
Member

Thanks!

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
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
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


Back | FazBrowse Home | New Git URL