From a4118b1a09c2a450446eab10d2c647edfa4a5176 Mon Sep 17 00:00:00 2001 From: Akuli Date: Sun, 5 Dec 2021 23:59:47 +0200 Subject: [PATCH] trust_server_pasv_ipv4_address: move comments to allowlists (#6496) Co-authored-by: Jelle Zijlstra --- stdlib/ftplib.pyi | 4 ---- tests/stubtest_allowlists/darwin-py36.txt | 2 +- tests/stubtest_allowlists/darwin-py37.txt | 4 +--- tests/stubtest_allowlists/linux-py36.txt | 2 +- tests/stubtest_allowlists/linux-py37.txt | 2 +- tests/stubtest_allowlists/py310.txt | 2 +- tests/stubtest_allowlists/py38.txt | 2 +- tests/stubtest_allowlists/py39.txt | 2 +- 8 files changed, 7 insertions(+), 13 deletions(-) diff --git a/stdlib/ftplib.pyi b/stdlib/ftplib.pyi index 3f4f892bb..745669ce0 100644 --- a/stdlib/ftplib.pyi +++ b/stdlib/ftplib.pyi @@ -33,10 +33,6 @@ class FTP: lastresp: str file: TextIO | None encoding: str - - # The following variable is intentionally left undocumented. - # See https://bugs.python.org/issue43285 for relevant discussion - # trust_server_pasv_ipv4_address: bool def __enter__(self: Self) -> Self: ... def __exit__( self, exc_type: Type[BaseException] | None, exc_val: BaseException | None, exc_tb: TracebackType | None diff --git a/tests/stubtest_allowlists/darwin-py36.txt b/tests/stubtest_allowlists/darwin-py36.txt index d5e38f94b..c083aac60 100644 --- a/tests/stubtest_allowlists/darwin-py36.txt +++ b/tests/stubtest_allowlists/darwin-py36.txt @@ -1,10 +1,10 @@ ctypes.wintypes +ftplib.FTP.trust_server_pasv_ipv4_address # Dangerous to use, intentionally undocumented, intentionally missing from typeshed. #6154 pwd.getpwnam ssl.PROTOCOL_SSLv3 # Depends on openssl compilation ssl.RAND_egd # Depends on openssl compilation # Exists at runtime, but missing from stubs -ftplib.FTP.trust_server_pasv_ipv4_address ntpath.splitunc posix.stat_float_times ssl.OP_ENABLE_MIDDLEBOX_COMPAT diff --git a/tests/stubtest_allowlists/darwin-py37.txt b/tests/stubtest_allowlists/darwin-py37.txt index 8c6d33126..a684628ec 100644 --- a/tests/stubtest_allowlists/darwin-py37.txt +++ b/tests/stubtest_allowlists/darwin-py37.txt @@ -1,6 +1,4 @@ _?curses.A_ITALIC ctypes.wintypes +ftplib.FTP.trust_server_pasv_ipv4_address # Dangerous to use, intentionally undocumented, intentionally missing from typeshed. #6154 pwd.getpwnam - -# Exists at runtime, but missing from stubs -ftplib.FTP.trust_server_pasv_ipv4_address diff --git a/tests/stubtest_allowlists/linux-py36.txt b/tests/stubtest_allowlists/linux-py36.txt index d5e38f94b..c083aac60 100644 --- a/tests/stubtest_allowlists/linux-py36.txt +++ b/tests/stubtest_allowlists/linux-py36.txt @@ -1,10 +1,10 @@ ctypes.wintypes +ftplib.FTP.trust_server_pasv_ipv4_address # Dangerous to use, intentionally undocumented, intentionally missing from typeshed. #6154 pwd.getpwnam ssl.PROTOCOL_SSLv3 # Depends on openssl compilation ssl.RAND_egd # Depends on openssl compilation # Exists at runtime, but missing from stubs -ftplib.FTP.trust_server_pasv_ipv4_address ntpath.splitunc posix.stat_float_times ssl.OP_ENABLE_MIDDLEBOX_COMPAT diff --git a/tests/stubtest_allowlists/linux-py37.txt b/tests/stubtest_allowlists/linux-py37.txt index 5f990bdec..8c4fabc04 100644 --- a/tests/stubtest_allowlists/linux-py37.txt +++ b/tests/stubtest_allowlists/linux-py37.txt @@ -1,8 +1,8 @@ ctypes.wintypes +ftplib.FTP.trust_server_pasv_ipv4_address # Dangerous to use, intentionally undocumented, intentionally missing from typeshed. #6154 pwd.getpwnam # Exists at runtime, but missing from stubs -ftplib.FTP.trust_server_pasv_ipv4_address os.RWF_DSYNC os.RWF_HIPRI os.RWF_NOWAIT diff --git a/tests/stubtest_allowlists/py310.txt b/tests/stubtest_allowlists/py310.txt index f78f240e8..3b10d297a 100644 --- a/tests/stubtest_allowlists/py310.txt +++ b/tests/stubtest_allowlists/py310.txt @@ -49,6 +49,7 @@ dataclasses.field dataclasses.KW_ONLY enum.Enum._generate_next_value_ fractions.Fraction.__new__ # overload is too complicated for stubtest to resolve +ftplib.FTP.trust_server_pasv_ipv4_address # Dangerous to use, intentionally undocumented, intentionally missing from typeshed. #6154 functools.partialmethod.__get__ functools.singledispatchmethod.__call__ gettext.install @@ -163,7 +164,6 @@ distutils.dist.DistributionMetadata.set_keywords distutils.dist.DistributionMetadata.set_platforms distutils.util.get_host_platform email.headerregistry.MessageIDHeader.max_count -ftplib.FTP.trust_server_pasv_ipv4_address importlib.abc.TraversableResources importlib.machinery.PathFinder.find_distributions importlib.metadata.Distribution.name diff --git a/tests/stubtest_allowlists/py38.txt b/tests/stubtest_allowlists/py38.txt index e11512528..48b175d8d 100644 --- a/tests/stubtest_allowlists/py38.txt +++ b/tests/stubtest_allowlists/py38.txt @@ -37,6 +37,7 @@ contextvars.Context.__init__ # Default C __init__ signature is wrong dataclasses.field enum.Enum._generate_next_value_ fractions.Fraction.__new__ # overload is too complicated for stubtest to resolve +ftplib.FTP.trust_server_pasv_ipv4_address # Dangerous to use, intentionally undocumented, intentionally missing from typeshed. #6154 functools.partialmethod.__get__ functools.singledispatchmethod.__call__ # A lie to reflect that the descriptor get returns a callable gettext.install # codeset default value is ['unspecified'] so can't be specified @@ -139,7 +140,6 @@ dummy_threading.setprofile dummy_threading.settrace dummy_threading.stack_size email.headerregistry.MessageIDHeader.max_count -ftplib.FTP.trust_server_pasv_ipv4_address html.parser.HTMLParser.unescape importlib.machinery.PathFinder.find_distributions importlib.metadata.EntryPoint.pattern diff --git a/tests/stubtest_allowlists/py39.txt b/tests/stubtest_allowlists/py39.txt index 71ad39249..070d2f60e 100644 --- a/tests/stubtest_allowlists/py39.txt +++ b/tests/stubtest_allowlists/py39.txt @@ -39,6 +39,7 @@ contextvars.Context.__init__ # Default C __init__ signature is wrong dataclasses.field enum.Enum._generate_next_value_ fractions.Fraction.__new__ # overload is too complicated for stubtest to resolve +ftplib.FTP.trust_server_pasv_ipv4_address # Dangerous to use, intentionally undocumented, intentionally missing from typeshed. #6154 functools.partialmethod.__get__ functools.singledispatchmethod.__call__ gettext.install @@ -138,7 +139,6 @@ distutils.sysconfig.expand_makefile_vars distutils.sysconfig.get_python_version distutils.util.get_host_platform email.headerregistry.MessageIDHeader.max_count -ftplib.FTP.trust_server_pasv_ipv4_address hmac.HMAC.digest_cons hmac.HMAC.inner hmac.HMAC.outer