◐ Shell
reader mode source ↗
Skip to content

bpo-44633: Fix parameter substitution of the union type with wrong types.#27218

Merged
serhiy-storchaka merged 4 commits into
python:mainfrom
serhiy-storchaka:union-wrong-parameter-substitution
Jul 18, 2021
Merged

bpo-44633: Fix parameter substitution of the union type with wrong types.#27218
serhiy-storchaka merged 4 commits into
python:mainfrom
serhiy-storchaka:union-wrong-parameter-substitution

Conversation

@serhiy-storchaka

@serhiy-storchaka serhiy-storchaka commented Jul 17, 2021 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Member

A TypeError is now raised instead of returning NotImplemented.

https://bugs.python.org/issue44633

@serhiy-storchaka
bpo-44633: Fix parameter substitution of the union type with wrong ty… …
2e27830 
…pes.

A TypeError is now raised instead of returning NotImplemented.
@serhiy-storchaka serhiy-storchaka added the type-bug An unexpected behavior, bug, or error label Jul 17, 2021
@serhiy-storchaka serhiy-storchaka added the needs backport to 3.10 only security fixes label Jul 17, 2021
@serhiy-storchaka @Fidget-Spinner
Update Misc/NEWS.d/next/Core and Builtins/2021-07-17-21-04-04.bpo-446… …
19fd606 
…33.5-zKeI.rst

Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
@serhiy-storchaka @Fidget-Spinner
Update Objects/unionobject.c …
567d3b8 
Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com>
@serhiy-storchaka serhiy-storchaka merged commit 3ea5332 into python:main Jul 18, 2021
@miss-islington

miss-islington commented Jul 18, 2021

Copy link
Copy Markdown
Contributor

Thanks @serhiy-storchaka for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@serhiy-storchaka serhiy-storchaka deleted the union-wrong-parameter-substitution branch July 18, 2021 09:10
@bedevere-bot

bedevere-bot commented Jul 18, 2021

Copy link
Copy Markdown

GH-27224 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 Jul 18, 2021
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 18, 2021
@serhiy-storchaka @miss-islington
bpo-44633: Fix parameter substitution of the union type with wrong ty… …
0855efe 
…pes. (pythonGH-27218)

A TypeError is now raised instead of returning NotImplemented.
(cherry picked from commit 3ea5332)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@bedevere-bot

bedevere-bot commented Jul 18, 2021 •
edited
Loading

Copy link
Copy Markdown

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

Hi! The buildbot PPC64 Fedora 3.x has failed when building commit 3ea5332.

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

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

Click to see traceback logs 
remote: Enumerating objects: 22, done.�[K
remote: Counting objects:   4% (1/22)�[K
remote: Counting objects:   9% (2/22)�[K
remote: Counting objects:  13% (3/22)�[K
remote: Counting objects:  18% (4/22)�[K
remote: Counting objects:  22% (5/22)�[K
remote: Counting objects:  27% (6/22)�[K
remote: Counting objects:  31% (7/22)�[K
remote: Counting objects:  36% (8/22)�[K
remote: Counting objects:  40% (9/22)�[K
remote: Counting objects:  45% (10/22)�[K
remote: Counting objects:  50% (11/22)�[K
remote: Counting objects:  54% (12/22)�[K
remote: Counting objects:  59% (13/22)�[K
remote: Counting objects:  63% (14/22)�[K
remote: Counting objects:  68% (15/22)�[K
remote: Counting objects:  72% (16/22)�[K
remote: Counting objects:  77% (17/22)�[K
remote: Counting objects:  81% (18/22)�[K
remote: Counting objects:  86% (19/22)�[K
remote: Counting objects:  90% (20/22)�[K
remote: Counting objects:  95% (21/22)�[K
remote: Counting objects: 100% (22/22)�[K
remote: Counting objects: 100% (22/22), done.�[K
remote: Compressing objects:  20% (1/5)�[K
remote: Compressing objects:  40% (2/5)�[K
remote: Compressing objects:  60% (3/5)�[K
remote: Compressing objects:  80% (4/5)�[K
remote: Compressing objects: 100% (5/5)�[K
remote: Compressing objects: 100% (5/5), done.�[K
remote: Total 12 (delta 10), reused 8 (delta 7), pack-reused 0�[K
From https://github.com/python/cpython
 * branch            main       -> FETCH_HEAD
Note: checking out '3ea5332a4365bdd771286b3e9692495116e9ceef'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by performing another checkout.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -b with the checkout command again. Example:

  git checkout -b new_branch_name

HEAD is now at 3ea5332... [bpo-44633](https://bugs.python.org/issue44633): Fix parameter substitution of the union type with wrong types. (GH-27218)
Switched to and reset branch 'main'

./configure: line 10530: PKG_PROG_PKG_CONFIG: command not found

/tmp/ccuAKG8x.s: Assembler messages:
/tmp/ccuAKG8x.s: Fatal error: can't close Parser/parser.o: No space left on device
make: *** [Parser/parser.o] Error 1

find: ‘build’: No such file or directory
find: ‘build’: No such file or directory
find: ‘build’: No such file or directory
find: ‘build’: No such file or directory
make: [clean-retain-profile] Error 1 (ignored)

@sthagen sthagen mentioned this pull request Jul 18, 2021
Merged
serhiy-storchaka added a commit that referenced this pull request Jul 18, 2021
@miss-islington @serhiy-storchaka
bpo-44633: Fix parameter substitution of the union type with wrong ty… …
85b5829 
…pes. (GH-27218) (GH-27224)

A TypeError is now raised instead of returning NotImplemented.
(cherry picked from commit 3ea5332)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
@bedevere-bot

bedevere-bot commented Jul 18, 2021

Copy link
Copy Markdown

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

Hi! The buildbot PPC64LE Fedora Stable LTO + PGO 3.10 has failed when building commit 85b5829.

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

Failed tests:

  • test_nntplib

Failed subtests:

  • setUpClass - test.test_nntplib.NetworkedNNTP_SSLTests

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

== Tests result: FAILURE then FAILURE ==

412 tests OK.

10 slowest tests:

  • test_concurrent_futures: 2 min 41 sec
  • test_multiprocessing_spawn: 1 min 7 sec
  • test_multiprocessing_fork: 1 min 1 sec
  • test_multiprocessing_forkserver: 58.3 sec
  • test_tokenize: 52.1 sec
  • test_signal: 47.3 sec
  • test_asyncio: 47.0 sec
  • test_io: 43.4 sec
  • test_unparse: 42.0 sec
  • test_lib2to3: 37.0 sec

1 test failed:
test_nntplib

14 tests skipped:
test_devpoll test_gdb test_ioctl test_kqueue test_msilib
test_ossaudiodev test_startfile test_tix test_tk test_ttk_guionly
test_winconsoleio test_winreg test_winsound test_zipfile64

1 re-run test:
test_nntplib

Total duration: 3 min 12 sec

Click to see traceback logs 
Traceback (most recent call last):
  File "/home/buildbot/buildarea/3.10.cstratak-fedora-stable-ppc64le.lto-pgo/build/Lib/test/test_nntplib.py", line 332, in setUpClass
    cls.server = cls.NNTP_CLASS(cls.NNTP_HOST, **kwargs)
  File "/home/buildbot/buildarea/3.10.cstratak-fedora-stable-ppc64le.lto-pgo/build/Lib/nntplib.py", line 1025, in __init__
    super().__init__(host, port, user, password, readermode,
  File "/home/buildbot/buildarea/3.10.cstratak-fedora-stable-ppc64le.lto-pgo/build/Lib/nntplib.py", line 334, in __init__
    self.sock = self._create_socket(timeout)
  File "/home/buildbot/buildarea/3.10.cstratak-fedora-stable-ppc64le.lto-pgo/build/Lib/nntplib.py", line 1031, in _create_socket
    sock = _encrypt_on(sock, self.ssl_context, self.host)
  File "/home/buildbot/buildarea/3.10.cstratak-fedora-stable-ppc64le.lto-pgo/build/Lib/nntplib.py", line 292, in _encrypt_on
    return context.wrap_socket(sock, server_hostname=hostname)
  File "/home/buildbot/buildarea/3.10.cstratak-fedora-stable-ppc64le.lto-pgo/build/Lib/ssl.py", line 512, in wrap_socket
    return self.sslsocket_class._create(
  File "/home/buildbot/buildarea/3.10.cstratak-fedora-stable-ppc64le.lto-pgo/build/Lib/ssl.py", line 1070, in _create
    self.do_handshake()
  File "/home/buildbot/buildarea/3.10.cstratak-fedora-stable-ppc64le.lto-pgo/build/Lib/ssl.py", line 1341, in do_handshake
    self._sslobj.do_handshake()
ssl.SSLError: [SSL: WRONG_VERSION_NUMBER] wrong version number (_ssl.c:997)

shihai1991 added a commit to shihai1991/cpython that referenced this pull request Jul 20, 2021
@shihai1991
Merge remote-tracking branch 'origin/main' into bpo_42035 …
56e8889 
* origin/main: (1146 commits)
  bpo-42064: Finalise establishing sqlite3 global state (pythonGH-27155)
  bpo-44678: Separate error message for discontinuous padding in binascii.a2b_base64 strict mode (pythonGH-27249)
  correct spelling (pythonGH-27076)
  bpo-44524: Add missed __name__ and __qualname__ to typing module objects (python#27237)
  bpo-27513: email.utils.getaddresses() now handles Header objects (python#13797)
  Clean up comma usage in Doc/library/functions.rst (python#27083)
  bpo-42238: Fix small rst issue in NEWS.d/. (python#27238)
  bpo-41972: Tweak fastsearch.h string search algorithms (pythonGH-27091)
  bpo-44340: Add support for building with clang full/thin lto (pythonGH-27231)
  bpo-44661: Update property_descr_set to use vectorcall if possible. (pythonGH-27206)
  bpo-44645: Check for interrupts on any potentially backwards edge (pythonGH-27216)
  bpo-41546: make pprint (like print) not write to stdout when it is None (pythonGH-26810)
  bpo-44554: refactor pdb targets (and internal tweaks) (pythonGH-26992)
  bpo-43086: Add handling for out-of-spec data in a2b_base64 (pythonGH-24402)
  bpo-44561: Update hyperlinks in Doc/distributing/index.rst (python#27032)
  bpo-42355: symtable.get_namespace() now checks whether there are multiple or any namespaces found (pythonGH-23278)
  bpo-44654: Do not export the union type related symbols (pythonGH-27223)
  bpo-44633: Fix parameter substitution of the union type with wrong types. (pythonGH-27218)
  bpo-44654: Refactor and clean up the union type implementation (pythonGH-27196)
  bpo-20291: Fix MSVC warnings in getargs.c (pythonGH-27211)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Fidget-Spinner Fidget-Spinner Fidget-Spinner approved these changes

Assignees

No one assigned

Labels

type-bug An unexpected behavior, bug, or error

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@serhiy-storchaka @miss-islington @bedevere-bot @Fidget-Spinner @the-knights-who-say-ni