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

bpo-43494: Make some minor changes to lnotab notes #24861

Merged
merged 1 commit into from
Mar 19, 2021

Conversation

smontanaro
Copy link
Contributor

@smontanaro smontanaro commented Mar 14, 2021

This cleanup makes no substantive changes.

https://bugs.python.org/issue43494

I need to understand this for my VM changes, so started reading. I initially wanted to just correct a typo (first change), but got a little carried away and edited a bit more.
@terryjreedy terryjreedy changed the title bpo-43494: Minor edits to new line number format description bpo-43494: Edit lnotab notes Mar 19, 2021
@terryjreedy terryjreedy changed the title bpo-43494: Edit lnotab notes bpo-43494: Make a few grammar changes to lnotab notes Mar 19, 2021
@terryjreedy terryjreedy changed the title bpo-43494: Make a few grammar changes to lnotab notes bpo-43494: Make some minor changes to lnotab notes Mar 19, 2021
@terryjreedy terryjreedy added needs backport to 3.8 needs backport to 3.9 only security fixes docs Documentation in the Doc dir labels Mar 19, 2021
@terryjreedy terryjreedy merged commit 7cb033c into python:master Mar 19, 2021
@miss-islington
Copy link
Contributor

Thanks @smontanaro for the PR, and @terryjreedy for merging it 🌮🎉.. I'm working now to backport this PR to: 3.8, 3.9.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @smontanaro and @terryjreedy, I could not cleanly backport this to 3.9 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 7cb033c423b65def1632d6c3c747111543b342a2 3.9

@miss-islington
Copy link
Contributor

Sorry @smontanaro and @terryjreedy, I had trouble checking out the 3.8 backport branch.
Please backport using cherry_picker on command line.
cherry_picker 7cb033c423b65def1632d6c3c747111543b342a2 3.8

@terryjreedy
Copy link
Member

Since the changes are purely a matter of form and not substance, I reviewed and merged.

It was not clear to me from the .txt itself whether it was describing the format of the current .co_lnotab attribute or that of the return of the new function that replaces it, or both, so I changes the title to match the unambiguous issue title using the doc title.

I then tried the backports, which failed. The 3.9 conflict suggests that the doc exists in 3.9. Skip, if so, and if you think the changes are relevant for you to do a backport, you can ask me to merge. The 3.8 'trouble checking out' is likely transitory, so a 3.9 backport might backport to 3.8.

jab added a commit to jab/cpython that referenced this pull request Mar 20, 2021
* master: (129 commits)
  bpo-43452: Micro-optimizations to PyType_Lookup (pythonGH-24804)
  bpo-43517: Fix false positive in detection of circular imports (python#24895)
  bpo-43494: Make some minor changes to lnotab notes (pythonGH-24861)
  Mention that code.co_lnotab is deprecated in what's new for 3.10. (python#24902)
  bpo-43244: Remove symtable.h header file (pythonGH-24910)
  bpo-43466: Add --with-openssl-rpath configure option (pythonGH-24820)
  Fix a typo in c-analyzer (pythonGH-24468)
  bpo-41561: Add workaround for Ubuntu's custom security level (pythonGH-24915)
  bpo-43521: Allow ast.unparse with empty sets and NaN (pythonGH-24897)
  bpo-43244: Remove the PyAST_Validate() function (pythonGH-24911)
  bpo-43541: Fix PyEval_EvalCodeEx() regression (pythonGH-24918)
  bpo-43244: Fix test_peg_generators on Windows (pythonGH-24913)
  bpo-39342: Expose X509_V_FLAG_ALLOW_PROXY_CERTS in ssl module (pythonGH-18011)
  bpo-43244: Fix test_peg_generator for PyAST_Validate() (pythonGH-24912)
  bpo-42128: Add 'missing :' syntax error message to match statements (pythonGH-24733)
  bpo-43244: Add pycore_ast.h header file (pythonGH-24908)
  bpo-43244: Rename pycore_ast.h to pycore_ast_state.h (pythonGH-24907)
  Remove unnecessary imports in the grammar parser (pythonGH-24904)
  bpo-35883: Py_DecodeLocale() escapes invalid Unicode characters (pythonGH-24843)
  Add PEP 626 to what's new in 3.10. (python#24892)
  ...
@smontanaro smontanaro deleted the patch-2 branch February 3, 2024 20:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Documentation in the Doc dir needs backport to 3.9 only security fixes skip news
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants