Skip to content

Add missing 'is' to cmath.log() docstring#102049

Merged
mdickinson merged 1 commit intopython:mainfrom
OTheDev:fix-cmath-log-docstring
Feb 19, 2023
Merged

Add missing 'is' to cmath.log() docstring#102049
mdickinson merged 1 commit intopython:mainfrom
OTheDev:fix-cmath-log-docstring

Conversation

@OTheDev
Copy link
Contributor

@OTheDev OTheDev commented Feb 19, 2023

No description provided.

mdickinson
mdickinson approved these changes Feb 19, 2023
View reviewed changes
Copy link
Member

@mdickinson mdickinson left a comment

Choose a reason for hiding this comment

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

LGTM!

@OTheDev
Copy link
Contributor Author

OTheDev commented Feb 19, 2023

Thanks!

@mdickinson
Copy link
Member

mdickinson commented Feb 19, 2023

One buildbot failure with no plausible connection to this PR.

@mdickinson mdickinson merged commit 71f614e into python:main Feb 19, 2023
@bedevere-bot
Copy link

bedevere-bot commented Feb 19, 2023

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot ARM64 macOS 3.x has failed when building commit 71f614e.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/all/#builders/725/builds/3776) and take a look at the build logs.
  4. Check if the failure is related to this commit (71f614e) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/all/#builders/725/builds/3776

Failed tests:

  • test_asyncio

Failed subtests:

  • test_wait_for_race_condition - test.test_asyncio.test_waitfor.AsyncioWaitForTest.test_wait_for_race_condition

Summary of the results of the build (if available):

== Tests result: FAILURE then FAILURE ==

405 tests OK.

10 slowest tests:

  • test_signal: 4 min 34 sec
  • test_concurrent_futures: 2 min 34 sec
  • test_multiprocessing_spawn: 2 min 5 sec
  • test_ssl: 1 min 45 sec
  • test_multiprocessing_forkserver: 1 min 38 sec
  • test_asyncio: 1 min 34 sec
  • test_math: 1 min 10 sec
  • test_logging: 1 min 5 sec
  • test_capi: 48.0 sec
  • test_tokenize: 39.1 sec

1 test failed:
test_asyncio

25 tests skipped:
test_check_c_globals test_devpoll test_epoll test_gdb test_idle
test_ioctl test_launcher test_msilib test_multiprocessing_fork
test_ossaudiodev test_peg_generator test_perf_profiler test_spwd
test_startfile test_tcl test_tix test_tkinter test_ttk
test_ttk_textonly test_turtle test_winconsoleio test_winreg
test_winsound test_wmi test_zipfile64

1 re-run test:
test_asyncio

Total duration: 9 min 21 sec

Click to see traceback logs 
Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/asyncio/tasks.py", line 478, in wait_for
    return await fut
           ^^^^^^^^^
asyncio.exceptions.CancelledError


Traceback (most recent call last):
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/unittest/async_case.py", line 90, in _callTestMethod
    if self._callMaybeAsync(method) is not None:
       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/unittest/async_case.py", line 112, in _callMaybeAsync
    return self._asyncioRunner.run(
           ^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/asyncio/runners.py", line 118, in run
    return self._loop.run_until_complete(task)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/asyncio/base_events.py", line 664, in run_until_complete
    return future.result()
           ^^^^^^^^^^^^^^^
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/test/test_asyncio/test_waitfor.py", line 163, in test_wait_for_race_condition
    res = await task
          ^^^^^^^^^^
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/asyncio/tasks.py", line 477, in wait_for
    async with timeouts.timeout(timeout):
  File "/Users/buildbot/buildarea/3.x.pablogsal-macos-m1.macos-with-brew/build/Lib/asyncio/timeouts.py", line 98, in __aexit__
    raise TimeoutError
TimeoutError

carljm added a commit to carljm/cpython that referenced this pull request Feb 20, 2023
@carljm
Merge branch 'main' into inlinecomp2
9f0fc5b 
* main: (60 commits)
  pythongh-102056: Fix a few bugs in error handling of exception printing code (python#102078)
  pythongh-102011: use sys.exception() instead of sys.exc_info() in docs where possible (python#102012)
  pythongh-101566: Sync with zipp 3.14. (pythonGH-102018)
  pythonGH-99818: improve the documentation for zipfile.Path and Traversable (pythonGH-101589)
  pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-96161)
  pythongh-101981: Apply HOMEBREW related environment variables (pythongh-102074)
  pythongh-101907: Stop using `_Py_OPCODE` and `_Py_OPARG` macros (pythonGH-101912)
  pythongh-101819: Adapt _io types to heap types, batch 1 (pythonGH-101949)
  pythongh-101981: Build macOS as recommended by the devguide (pythonGH-102070)
  pythongh-97786: Fix compiler warnings in pytime.c (python#101826)
  pythongh-101578: Amend PyErr_{Set,Get}RaisedException docs (python#101962)
  Misc improvements to the float tutorial (pythonGH-102052)
  pythongh-85417: Clarify behaviour on branch cuts in cmath module (python#102046)
  pythongh-100425: Update tutorial docs related to sum() accuracy (FH-101854)
  Add missing 'is' to `cmath.log()` docstring (python#102049)
  pythongh-100210: Correct the comment link for unescaping HTML (python#100212)
  pythongh-97930: Also include subdirectory in makefile. (python#102030)
  pythongh-99735: Use required=True in argparse subparsers example (python#100927)
  Fix incorrectly documented attribute in csv docs (python#101250)
  pythonGH-84783: Make the slice object hashable (pythonGH-101264)
  ...
carljm added a commit to carljm/cpython that referenced this pull request Feb 22, 2023
@carljm
Merge branch 'main' into inlinecomp
544b30c 
* main: (225 commits)
  pythongh-102056: Fix a few bugs in error handling of exception printing code (python#102078)
  pythongh-102011: use sys.exception() instead of sys.exc_info() in docs where possible (python#102012)
  pythongh-101566: Sync with zipp 3.14. (pythonGH-102018)
  pythonGH-99818: improve the documentation for zipfile.Path and Traversable (pythonGH-101589)
  pythongh-88233: zipfile: handle extras after a zip64 extra (pythonGH-96161)
  pythongh-101981: Apply HOMEBREW related environment variables (pythongh-102074)
  pythongh-101907: Stop using `_Py_OPCODE` and `_Py_OPARG` macros (pythonGH-101912)
  pythongh-101819: Adapt _io types to heap types, batch 1 (pythonGH-101949)
  pythongh-101981: Build macOS as recommended by the devguide (pythonGH-102070)
  pythongh-97786: Fix compiler warnings in pytime.c (python#101826)
  pythongh-101578: Amend PyErr_{Set,Get}RaisedException docs (python#101962)
  Misc improvements to the float tutorial (pythonGH-102052)
  pythongh-85417: Clarify behaviour on branch cuts in cmath module (python#102046)
  pythongh-100425: Update tutorial docs related to sum() accuracy (FH-101854)
  Add missing 'is' to `cmath.log()` docstring (python#102049)
  pythongh-100210: Correct the comment link for unescaping HTML (python#100212)
  pythongh-97930: Also include subdirectory in makefile. (python#102030)
  pythongh-99735: Use required=True in argparse subparsers example (python#100927)
  Fix incorrectly documented attribute in csv docs (python#101250)
  pythonGH-84783: Make the slice object hashable (pythonGH-101264)
  ...
@mdickinson mdickinson added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Feb 26, 2023
@miss-islington
Copy link
Contributor

miss-islington commented Feb 26, 2023

Thanks @OTheDev for the PR, and @mdickinson for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

miss-islington commented Feb 26, 2023

Thanks @OTheDev for the PR, and @mdickinson for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

miss-islington commented Feb 26, 2023

Sorry, @OTheDev and @mdickinson, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 71f614ef2a3d66213b9cae807cbbc1ed03741221 3.10

@miss-islington
Copy link
Contributor

miss-islington commented Feb 26, 2023

Sorry @OTheDev and @mdickinson, I had trouble checking out the 3.11 backport branch.
Please retry by removing and re-adding the "needs backport to 3.11" label.
Alternatively, you can backport using cherry_picker on the command line.
cherry_picker 71f614ef2a3d66213b9cae807cbbc1ed03741221 3.11

@mdickinson
Copy link
Member

mdickinson commented Feb 26, 2023

Gah. The backports are going to get hung up on the argument clinic hashes, of course.

mdickinson pushed a commit to mdickinson/cpython that referenced this pull request Feb 26, 2023
@OTheDev @mdickinson
[3.11] Add missing 'is' to cmath.log() docstring (pythonGH-102049)
bdb9e01 
Fix missing 'is' in cmath.log() docstring.
(cherry picked from commit 71f614e)

Co-authored-by: Owain Davies <116417456+OTheDev@users.noreply.github.com>
@bedevere-bot
Copy link

bedevere-bot commented Feb 26, 2023

GH-102279 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Feb 26, 2023
@bedevere-bot
Copy link

bedevere-bot commented Feb 26, 2023

GH-102280 is a backport of this pull request to the 3.10 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Feb 26, 2023
@OTheDev
Copy link
Contributor Author

OTheDev commented Feb 26, 2023

Sorry, I've only just noticed that there were issues with the backports!

@OTheDev
Copy link
Contributor Author

OTheDev commented Feb 26, 2023

Thanks a lot!

@mdickinson
Copy link
Member

mdickinson commented Feb 26, 2023

I've only just noticed that there were issues with the backports!

That's because I only just got around to actually trying to backport. :-)

mdickinson added a commit that referenced this pull request Feb 26, 2023
@mdickinson @OTheDev
[3.11] Add missing 'is' to cmath.log() docstring (GH-102049) (#102279)
eb55659 
Fix missing 'is' in cmath.log() docstring.
(cherry picked from commit 71f614e)

Co-authored-by: Owain Davies <116417456+OTheDev@users.noreply.github.com>
mdickinson added a commit that referenced this pull request Feb 26, 2023
@mdickinson @OTheDev
[3.10] Add missing 'is' to cmath.log() docstring (GH-102049) (#102280)
8e9ffd9 
Fix missing 'is' in cmath.log() docstring.
(cherry picked from commit 71f614e)

Co-authored-by: Owain Davies <116417456+OTheDev@users.noreply.github.com>
@OTheDev OTheDev deleted the fix-cmath-log-docstring branch January 28, 2025 03:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@mdickinson mdickinson mdickinson approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@mdickinson mdickinson

Labels

skip issue skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@OTheDev @mdickinson @bedevere-bot @miss-islington