GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — gh-107932: Fix merge conflict in test_dis by markshannon · Pull Request #108478 · python/cpython

Conversation

@markshannon

@markshannon markshannon commented Aug 25, 2023 •
edited by bedevere-bot
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Member
  • Issue: dis.dis() reports line numbers where there are none. #107932

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
CorvinM reacted with thumbs up emoji
All reactions
  • 👍 1 reaction
@markshannon
Fix merge conflict in test_dis
50edb39
@markshannon markshannon added skip issue skip news labels Aug 25, 2023
@bedevere-bot bedevere-bot added tests Tests in the Lib/test dir awaiting core review labels Aug 25, 2023
@markshannon markshannon mentioned this pull request Aug 25, 2023
gh-107932: Fix dis module for bytecode that does not have an associated source line #107988
Merged
@erlend-aasland

erlend-aasland commented Aug 25, 2023

Copy link
Copy Markdown
Contributor

Hah, looks like we opened fixes at the same time; #108479
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@erlend-aasland erlend-aasland changed the title Fix merge conflict in test_dis gh-107932: Fix merge conflict in test_dis Aug 25, 2023
@erlend-aasland erlend-aasland removed the skip issue label Aug 25, 2023
@bedevere-bot bedevere-bot mentioned this pull request Aug 25, 2023
dis.dis() reports line numbers where there are none. #107932
Closed
@erlend-aasland erlend-aasland mentioned this pull request Aug 25, 2023
gh-107932: Fix test_dis #108479
Closed
erlend-aasland
erlend-aasland approved these changes Aug 25, 2023
View reviewed changes
@bedevere-bot bedevere-bot added awaiting merge and removed awaiting core review labels Aug 25, 2023
@markshannon
markshannon merged commit bc2f9e6 into python:main Aug 25, 2023
@bedevere-bot bedevere-bot added awaiting core review and removed awaiting merge labels Aug 25, 2023
@bedevere-bot

This comment was marked as off-topic.

Sign in to view
@bedevere-bot
bedevere-bot requested a review from erlend-aasland August 25, 2023 12:02
@markshannon
markshannon deleted the fix-test-dis branch September 5, 2023 12:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@erlend-aasland erlend-aasland Awaiting requested review from erlend-aasland

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

awaiting core review skip news tests Tests in the Lib/test dir

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

3 participants

@markshannon @erlend-aasland @bedevere-bot
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.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.