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

Update error message in _zoneinfo.py to use f-string #20577

Merged
merged 2 commits into from
Jun 3, 2020
Merged

Update error message in _zoneinfo.py to use f-string #20577

merged 2 commits into from
Jun 3, 2020

Conversation

aboddie
Copy link
Contributor

@aboddie aboddie commented Jun 1, 2020

Inline with the rest of the file, updated error message to use f-string.

Automerge-Triggered-By: @pganssle

Inline with the rest of the file, updated error message to use f-string.
@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

Recognized GitHub username

We couldn't find a bugs.python.org (b.p.o) account corresponding to the following GitHub usernames:

@aboddie

This might be simply due to a missing "GitHub Name" entry in one's b.p.o account settings. This is necessary for legal reasons before we can look at this contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

fix missing space in error message.

Co-authored-by: Paul Ganssle <p.ganssle@gmail.com>
@pganssle pganssle added the needs backport to 3.9 only security fixes label Jun 3, 2020
@miss-islington
Copy link
Contributor

Thanks @aboddie for the PR 🌮🎉.. I'm working now to backport this PR to: 3.9.
🐍🍒⛏🤖

@pganssle
Copy link
Member

pganssle commented Jun 3, 2020

Thanks for the contribution @aboddie!

@bedevere-bot bedevere-bot removed the needs backport to 3.9 only security fixes label Jun 3, 2020
@bedevere-bot
Copy link

GH-20612 is a backport of this pull request to the 3.9 branch.

miss-islington added a commit that referenced this pull request Jun 3, 2020
Inline with the rest of the file, updated error message to use f-string.
(cherry picked from commit 5b9fbba)

Co-authored-by: aboddie <64019758+aboddie@users.noreply.github.com>
@bedevere-bot
Copy link

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

Hi! The buildbot PPC64 Fedora 3.9 has failed when building commit a125561.

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/746/builds/57) and take a look at the build logs.
  4. Check if the failure is related to this commit (a125561) 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/746/builds/57

Failed tests:

  • test_asyncio

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

==

Click to see traceback logs
remote: Enumerating objects: 5, done.�[K
remote: Counting objects:  20% (1/5)�[K
remote: Counting objects:  40% (2/5)�[K
remote: Counting objects:  60% (3/5)�[K
remote: Counting objects:  80% (4/5)�[K
remote: Counting objects: 100% (5/5)�[K
remote: Counting objects: 100% (5/5), done.�[K
remote: Total 5 (delta 4), reused 4 (delta 4), pack-reused 0�[K
From https://github.com/python/cpython
 * branch            3.9        -> FETCH_HEAD
Reset branch '3.9'

test_msilib skipped -- No module named '_msi'
test_winconsoleio skipped -- test only relevant on win32
test_kqueue skipped -- test works only on BSD
test_winsound skipped -- No module named 'winsound'
test_winreg skipped -- No module named 'winreg'
test_ioctl skipped -- Unable to open /dev/tty
test_devpoll skipped -- test works only on Solaris OS family
<string>:2: PendingDeprecationWarning: lib2to3 package is deprecated and may not be able to parse Python 3.10+
test_tk skipped -- Tk unavailable due to TclError: no display name and no $DISPLAY environment variab [...]
/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/multiprocessing/resource_tracker.py:216: UserWarning: resource_tracker: There appear to be 1 leaked shared_memory objects to clean up at shutdown
  warnings.warn('resource_tracker: There appear to be %d '
/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/multiprocessing/resource_tracker.py:229: UserWarning: resource_tracker: '/psm_8f90ade6': [Errno 2] No such file or directory: '/psm_8f90ade6'
  warnings.warn('resource_tracker: %r: %s' % (name, e))
/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/multiprocessing/resource_tracker.py:216: UserWarning: resource_tracker: There appear to be 1 leaked shared_memory objects to clean up at shutdown
  warnings.warn('resource_tracker: There appear to be %d '
/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/multiprocessing/resource_tracker.py:229: UserWarning: resource_tracker: '/psm_0a98b4f4': [Errno 2] No such file or directory: '/psm_0a98b4f4'
  warnings.warn('resource_tracker: %r: %s' % (name, e))
test_ttk_guionly skipped -- Tk unavailable due to TclError: no display name and no $DISPLAY environment variab [...]
test_startfile skipped -- object <module 'os' from '/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/os.py'> has no attribute 'startfile'
test_ossaudiodev skipped -- [Errno 2] No such file or directory: '/dev/dsp'
test_tix skipped -- Tk unavailable due to TclError: no display name and no $DISPLAY environment variab [...]
/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/multiprocessing/resource_tracker.py:216: UserWarning: resource_tracker: There appear to be 1 leaked shared_memory objects to clean up at shutdown
  warnings.warn('resource_tracker: There appear to be %d '
/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/multiprocessing/resource_tracker.py:229: UserWarning: resource_tracker: '/psm_9c7f6b89': [Errno 2] No such file or directory: '/psm_9c7f6b89'
  warnings.warn('resource_tracker: %r: %s' % (name, e))
test_zipfile64 skipped -- test requires loads of disk-space bytes and a long time to run
test_flock (__main__.FNTLEINTRTest) ... ok
test_lockf (__main__.FNTLEINTRTest) ... ok
test_read (__main__.OSEINTRTest) ... ok
test_wait (__main__.OSEINTRTest) ... ok
test_wait3 (__main__.OSEINTRTest) ... ok
test_wait4 (__main__.OSEINTRTest) ... ok
test_waitpid (__main__.OSEINTRTest) ... ok
test_write (__main__.OSEINTRTest) ... ok
test_devpoll (__main__.SelectEINTRTest) ... skipped 'need select.devpoll'
test_epoll (__main__.SelectEINTRTest) ... ok
test_kqueue (__main__.SelectEINTRTest) ... skipped 'need select.kqueue'
test_poll (__main__.SelectEINTRTest) ... ok
test_select (__main__.SelectEINTRTest) ... ok
test_sigtimedwait (__main__.SignalEINTRTest) ... ok
test_sigwaitinfo (__main__.SignalEINTRTest) ... ok
test_accept (__main__.SocketEINTRTest) ... ok
test_open (__main__.SocketEINTRTest) ... ok
test_os_open (__main__.SocketEINTRTest) ... ok
test_recv (__main__.SocketEINTRTest) ... ok
test_recvmsg (__main__.SocketEINTRTest) ... ok
test_send (__main__.SocketEINTRTest) ... ok
test_sendall (__main__.SocketEINTRTest) ... ok
test_sendmsg (__main__.SocketEINTRTest) ... ok
test_sleep (__main__.TimeEINTRTest) ... ok

----------------------------------------------------------------------
Ran 24 tests in 6.843s

OK (skipped=2)
Timeout (0:15:00)!
Thread 0x00003fff7e0b5810 (most recent call first):
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/selectors.py", line 468 in select
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/asyncio/base_events.py", line 1854 in _run_once
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/asyncio/base_events.py", line 596 in run_forever
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/asyncio/base_events.py", line 629 in run_until_complete
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/test_asyncio/test_subprocess.py", line 176 in test_kill
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/case.py", line 550 in _callTestMethod
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/case.py", line 593 in run
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/case.py", line 653 in __call__
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 122 in run
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 84 in __call__
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 122 in run
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 84 in __call__
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 122 in run
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 84 in __call__
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 122 in run
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 84 in __call__
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 122 in run
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 84 in __call__
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/runner.py", line 176 in run
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/support/__init__.py", line 1795 in _run_suite
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/support/__init__.py", line 1917 in run_unittest
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/runtest.py", line 209 in _test_module
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/runtest.py", line 234 in _runtest_inner2
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/runtest.py", line 270 in _runtest_inner
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/runtest.py", line 140 in _runtest
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/runtest.py", line 193 in runtest
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/runtest_mp.py", line 80 in run_tests_worker
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/main.py", line 657 in _main
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/main.py", line 637 in main
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/main.py", line 715 in main
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/regrtest.py", line 43 in _main
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/regrtest.py", line 47 in <module>
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/runpy.py", line 87 in _run_code
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/runpy.py", line 197 in _run_module_as_main
Timeout (0:15:00)!
Thread 0x00003fff8e985810 (most recent call first):
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/selectors.py", line 468 in select
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/asyncio/base_events.py", line 1854 in _run_once
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/asyncio/base_events.py", line 596 in run_forever
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/asyncio/base_events.py", line 629 in run_until_complete
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/test_asyncio/test_subprocess.py", line 189 in test_terminate
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/case.py", line 550 in _callTestMethod
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/case.py", line 593 in run
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/case.py", line 653 in __call__
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 122 in run
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 84 in __call__
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 122 in run
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 84 in __call__
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 122 in run
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 84 in __call__
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 122 in run
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 84 in __call__
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 122 in run
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/suite.py", line 84 in __call__
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/unittest/runner.py", line 176 in run
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/support/__init__.py", line 1795 in _run_suite
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/support/__init__.py", line 1917 in run_unittest
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/runtest.py", line 209 in _test_module
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/runtest.py", line 234 in _runtest_inner2
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/runtest.py", line 270 in _runtest_inner
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/runtest.py", line 153 in _runtest
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/runtest.py", line 193 in runtest
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/main.py", line 318 in rerun_failed_tests
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/main.py", line 694 in _main
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/main.py", line 637 in main
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/libregrtest/main.py", line 715 in main
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/test/__main__.py", line 2 in <module>
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/runpy.py", line 87 in _run_code
  File "/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/Lib/runpy.py", line 197 in _run_module_as_main
make: *** [buildbottest] Error 1

Cannot open file '/home/shager/cpython-buildarea/3.9.edelsohn-fedora-ppc64/build/test-results.xml' for upload

arun-mani-j pushed a commit to arun-mani-j/cpython that referenced this pull request Jul 21, 2020
Inline with the rest of the file, updated error message to use f-string.
@aboddie aboddie deleted the patch-2 branch August 20, 2020 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants