Replace non-ellipsis default arguments (#2550)

2025-12-10 05:51:52 +08:00 · 2018-11-20 16:35:06 +01:00
parent b7d6bab83f
commit cd75801aa5
55 changed files with 649 additions and 566 deletions
--- a/stdlib/2/Cookie.pyi
+++ b/stdlib/2/Cookie.pyi
@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional

 class CookieError(Exception): ...

@@ -10,17 +10,17 @@ class Morsel(dict):
    value = ...  # type: Any
    coded_value = ...  # type: Any
    def set(self, key, val, coded_val, LegalChars=..., idmap=..., translate=...): ...
-    def output(self, attrs=None, header=...): ...
-    def js_output(self, attrs=None): ...
-    def OutputString(self, attrs=None): ...
+    def output(self, attrs: Optional[Any] = ..., header=...): ...
+    def js_output(self, attrs: Optional[Any] = ...): ...
+    def OutputString(self, attrs: Optional[Any] = ...): ...

 class BaseCookie(dict):
    def value_decode(self, val): ...
    def value_encode(self, val): ...
-    def __init__(self, input=None): ...
+    def __init__(self, input: Optional[Any] = ...): ...
    def __setitem__(self, key, value): ...
-    def output(self, attrs=None, header=..., sep=...): ...
-    def js_output(self, attrs=None): ...
+    def output(self, attrs: Optional[Any] = ..., header=..., sep=...): ...
+    def js_output(self, attrs: Optional[Any] = ...): ...
    def load(self, rawdata): ...

 class SimpleCookie(BaseCookie):
@@ -28,12 +28,12 @@ class SimpleCookie(BaseCookie):
    def value_encode(self, val): ...

 class SerialCookie(BaseCookie):
-    def __init__(self, input=None): ...
+    def __init__(self, input: Optional[Any] = ...): ...
    def value_decode(self, val): ...
    def value_encode(self, val): ...

 class SmartCookie(BaseCookie):
-    def __init__(self, input=None): ...
+    def __init__(self, input: Optional[Any] = ...): ...
    def value_decode(self, val): ...
    def value_encode(self, val): ...

--- a/stdlib/2/cookielib.pyi
+++ b/stdlib/2/cookielib.pyi
@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional

 class Cookie:
    version = ...  # type: Any
@@ -17,11 +17,12 @@ class Cookie:
    comment = ...  # type: Any
    comment_url = ...  # type: Any
    rfc2109 = ...  # type: Any
-    def __init__(self, version, name, value, port, port_specified, domain, domain_specified, domain_initial_dot, path, path_specified, secure, expires, discard, comment, comment_url, rest, rfc2109=False): ...
+    def __init__(self, version, name, value, port, port_specified, domain, domain_specified, domain_initial_dot, path,
+                 path_specified, secure, expires, discard, comment, comment_url, rest, rfc2109: bool = ...): ...
    def has_nonstandard_attr(self, name): ...
-    def get_nonstandard_attr(self, name, default=None): ...
+    def get_nonstandard_attr(self, name, default: Optional[Any] = ...): ...
    def set_nonstandard_attr(self, name, value): ...
-    def is_expired(self, now=None): ...
+    def is_expired(self, now: Optional[Any] = ...): ...

 class CookiePolicy:
    def set_ok(self, cookie, request): ...
@@ -45,7 +46,10 @@ class DefaultCookiePolicy(CookiePolicy):
    strict_ns_domain = ...  # type: Any
    strict_ns_set_initial_dollar = ...  # type: Any
    strict_ns_set_path = ...  # type: Any
-    def __init__(self, blocked_domains=None, allowed_domains=None, netscape=True, rfc2965=False, rfc2109_as_netscape=None, hide_cookie2=False, strict_domain=False, strict_rfc2965_unverifiable=True, strict_ns_unverifiable=False, strict_ns_domain=..., strict_ns_set_initial_dollar=False, strict_ns_set_path=False): ...
+    def __init__(self, blocked_domains: Optional[Any] = ..., allowed_domains: Optional[Any] = ..., netscape: bool = ...,
+                 rfc2965: bool = ..., rfc2109_as_netscape: Optional[Any] = ..., hide_cookie2: bool = ...,
+                 strict_domain: bool = ..., strict_rfc2965_unverifiable: bool = ..., strict_ns_unverifiable: bool = ...,
+                 strict_ns_domain=..., strict_ns_set_initial_dollar: bool = ..., strict_ns_set_path: bool = ...): ...
    def blocked_domains(self): ...
    def set_blocked_domains(self, blocked_domains): ...
    def is_blocked(self, domain): ...
@@ -78,14 +82,14 @@ class CookieJar:
    domain_re = ...  # type: Any
    dots_re = ...  # type: Any
    magic_re = ...  # type: Any
-    def __init__(self, policy=None): ...
+    def __init__(self, policy: Optional[Any] = ...): ...
    def set_policy(self, policy): ...
    def add_cookie_header(self, request): ...
    def make_cookies(self, response, request): ...
    def set_cookie_if_ok(self, cookie, request): ...
    def set_cookie(self, cookie): ...
    def extract_cookies(self, response, request): ...
-    def clear(self, domain=None, path=None, name=None): ...
+    def clear(self, domain: Optional[Any] = ..., path: Optional[Any] = ..., name: Optional[Any] = ...): ...
    def clear_session_cookies(self): ...
    def clear_expired_cookies(self): ...
    def __iter__(self): ...
@@ -96,10 +100,10 @@ class LoadError(IOError): ...
 class FileCookieJar(CookieJar):
    filename = ...  # type: Any
    delayload = ...  # type: Any
-    def __init__(self, filename=None, delayload=False, policy=None): ...
-    def save(self, filename=None, ignore_discard=False, ignore_expires=False): ...
-    def load(self, filename=None, ignore_discard=False, ignore_expires=False): ...
-    def revert(self, filename=None, ignore_discard=False, ignore_expires=False): ...
+    def __init__(self, filename: Optional[Any] = ..., delayload: bool = ..., policy: Optional[Any] = ...): ...
+    def save(self, filename: Optional[Any] = ..., ignore_discard: bool = ..., ignore_expires: bool = ...): ...
+    def load(self, filename: Optional[Any] = ..., ignore_discard: bool = ..., ignore_expires: bool = ...): ...
+    def revert(self, filename: Optional[Any] = ..., ignore_discard: bool = ..., ignore_expires: bool = ...): ...

 MozillaCookieJar = FileCookieJar
 LWPCookieJar = FileCookieJar
--- a/stdlib/2/email/_parseaddr.pyi
+++ b/stdlib/2/email/_parseaddr.pyi
@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional

 def parsedate_tz(data): ...
 def parsedate(data): ...
@@ -22,11 +22,11 @@ class AddrlistClass:
    def getrouteaddr(self): ...
    def getaddrspec(self): ...
    def getdomain(self): ...
-    def getdelimited(self, beginchar, endchars, allowcomments=True): ...
+    def getdelimited(self, beginchar, endchars, allowcomments: bool = ...): ...
    def getquote(self): ...
    def getcomment(self): ...
    def getdomainliteral(self): ...
-    def getatom(self, atomends=None): ...
+    def getatom(self, atomends: Optional[Any] = ...): ...
    def getphraselist(self): ...

 class AddressList(AddrlistClass):
--- a/stdlib/2/email/utils.pyi
+++ b/stdlib/2/email/utils.pyi
@@ -3,16 +3,17 @@ from email._parseaddr import mktime_tz as mktime_tz
 from email._parseaddr import parsedate as _parsedate
 from email._parseaddr import parsedate_tz as _parsedate_tz
 from quopri import decodestring as _qdecode
+from typing import Optional, Any

 def formataddr(pair): ...
 def getaddresses(fieldvalues): ...
-def formatdate(timeval=None, localtime=False, usegmt=False): ...
-def make_msgid(idstring=None): ...
+def formatdate(timeval: Optional[Any] = ..., localtime: bool = ..., usegmt: bool = ...): ...
+def make_msgid(idstring: Optional[Any] = ...): ...
 def parsedate(data): ...
 def parsedate_tz(data): ...
 def parseaddr(addr): ...
 def unquote(str): ...
 def decode_rfc2231(s): ...
-def encode_rfc2231(s, charset=None, language=None): ...
+def encode_rfc2231(s, charset: Optional[Any] = ..., language: Optional[Any] = ...): ...
 def decode_params(params): ...
 def collapse_rfc2231_value(value, errors=..., fallback_charset=...): ...
--- a/stdlib/2/httplib.pyi
+++ b/stdlib/2/httplib.pyi
@@ -3,13 +3,13 @@
 # Generated by stubgen and manually massaged a bit.
 # Needs lots more work!

-from typing import Any, Dict
+from typing import Any, Dict, Optional
 import mimetools

 class HTTPMessage(mimetools.Message):
-    def addheader(self, key: str, value: str) -> None: ...
    def addcontinue(self, key: str, more: str) -> None: ...
    dict = ...  # type: Dict[str, str]
+    def addheader(self, key: str, value: str) -> None: ...
    unixfrom = ...  # type: str
    headers = ...  # type: Any
    status = ...  # type: str
@@ -28,13 +28,14 @@ class HTTPResponse:
    chunk_left = ...  # type: Any
    length = ...  # type: Any
    will_close = ...  # type: Any
-    def __init__(self, sock, debuglevel=0, strict=0, method=None, buffering: bool = ...) -> None: ...
+    def __init__(self, sock, debuglevel: int = ..., strict: int = ..., method: Optional[Any] = ...,
+                 buffering: bool = ...) -> None: ...
    def begin(self): ...
    def close(self): ...
    def isclosed(self): ...
-    def read(self, amt=None): ...
+    def read(self, amt: Optional[Any] = ...): ...
    def fileno(self): ...
-    def getheader(self, name, default=None): ...
+    def getheader(self, name, default: Optional[Any] = ...): ...
    def getheaders(self): ...

 class HTTPConnection:
@@ -48,22 +49,23 @@ class HTTPConnection:
    sock = ...  # type: Any
    host: str = ...
    port: int = ...
-    def __init__(self, host, port=None, strict=None, timeout=..., source_address=None) -> None: ...
-    def set_tunnel(self, host, port=None, headers=None): ...
+    def __init__(self, host, port: Optional[Any] = ..., strict: Optional[Any] = ..., timeout=...,
+                 source_address: Optional[Any] = ...) -> None: ...
+    def set_tunnel(self, host, port: Optional[Any] = ..., headers: Optional[Any] = ...): ...
    def set_debuglevel(self, level): ...
    def connect(self): ...
    def close(self): ...
    def send(self, data): ...
-    def putrequest(self, method, url, skip_host=0, skip_accept_encoding=0): ...
+    def putrequest(self, method, url, skip_host: int = ..., skip_accept_encoding: int = ...): ...
    def putheader(self, header, *values): ...
-    def endheaders(self, message_body=None): ...
-    def request(self, method, url, body=None, headers=...): ...
+    def endheaders(self, message_body: Optional[Any] = ...): ...
+    def request(self, method, url, body: Optional[Any] = ..., headers=...): ...
    def getresponse(self, buffering: bool = ...): ...

 class HTTP:
    debuglevel = ...  # type: Any
-    def __init__(self, host: str = ..., port=None, strict=None) -> None: ...
-    def connect(self, host=None, port=None): ...
+    def __init__(self, host: str = ..., port: Optional[Any] = ..., strict: Optional[Any] = ...) -> None: ...
+    def connect(self, host: Optional[Any] = ..., port: Optional[Any] = ...): ...
    def getfile(self): ...
    file = ...  # type: Any
    headers = ...  # type: Any
@@ -74,14 +76,16 @@ class HTTPSConnection(HTTPConnection):
    default_port = ...  # type: Any
    key_file = ...  # type: Any
    cert_file = ...  # type: Any
-    def __init__(self, host, port=None, key_file=None, cert_file=None, strict=None, timeout=..., source_address=None, context=None) -> None: ...
+    def __init__(self, host, port: Optional[Any] = ..., key_file: Optional[Any] = ..., cert_file: Optional[Any] = ...,
+                 strict: Optional[Any] = ..., timeout=..., source_address: Optional[Any] = ...,
+                 context: Optional[Any] = ...) -> None: ...
    sock = ...  # type: Any
    def connect(self): ...

 class HTTPS(HTTP):
    key_file = ...  # type: Any
    cert_file = ...  # type: Any
-    def __init__(self, host: str = ..., port=None, key_file=None, cert_file=None, strict=None, context=None) -> None: ...
+    def __init__(self, host: str = ..., port: Optional[Any] = ..., key_file: Optional[Any] = ..., cert_file: Optional[Any] = ..., strict: Optional[Any] = ..., context: Optional[Any] = ...) -> None: ...

 class HTTPException(Exception): ...
 class NotConnected(HTTPException): ...
@@ -99,7 +103,7 @@ class IncompleteRead(HTTPException):
    args = ...  # type: Any
    partial = ...  # type: Any
    expected = ...  # type: Any
-    def __init__(self, partial, expected=None) -> None: ...
+    def __init__(self, partial, expected: Optional[Any] = ...) -> None: ...

 class ImproperConnectionState(HTTPException): ...
 class CannotSendRequest(ImproperConnectionState): ...
@@ -119,9 +123,9 @@ error = ...  # type: Any
 class LineAndFileWrapper:
    def __init__(self, line, file) -> None: ...
    def __getattr__(self, attr): ...
-    def read(self, amt=None): ...
+    def read(self, amt: Optional[Any] = ...): ...
    def readline(self): ...
-    def readlines(self, size=None): ...
+    def readlines(self, size: Optional[Any] = ...): ...

 # Constants

--- a/stdlib/2/mimetools.pyi
+++ b/stdlib/2/mimetools.pyi
@@ -4,7 +4,7 @@ import rfc822
 class Message(rfc822.Message):
    encodingheader = ...  # type: Any
    typeheader = ...  # type: Any
-    def __init__(self, fp, seekable=1): ...
+    def __init__(self, fp, seekable: int = ...): ...
    plisttext = ...  # type: Any
    type = ...  # type: Any
    maintype = ...  # type: Any
--- a/stdlib/2/multiprocessing/init.pyi
+++ b/stdlib/2/multiprocessing/init.pyi
@@ -26,19 +26,19 @@ class Queue(_BaseQueue[_T]):
    def cancel_join_thread(self) -> None: ...

 def Manager(): ...
-def Pipe(duplex=True): ...
+def Pipe(duplex: bool = ...): ...
 def cpu_count() -> int: ...
 def freeze_support(): ...
 def get_logger(): ...
-def log_to_stderr(level=None): ...
+def log_to_stderr(level: Optional[Any] = ...): ...
 def allow_connection_pickling(): ...
 def Lock(): ...
 def RLock(): ...
-def Condition(lock=None): ...
-def Semaphore(value=1): ...
-def BoundedSemaphore(value=1): ...
+def Condition(lock: Optional[Any] = ...): ...
+def Semaphore(value: int = ...): ...
+def BoundedSemaphore(value: int = ...): ...
 def Event(): ...
-def JoinableQueue(maxsize=0): ...
+def JoinableQueue(maxsize: int = ...): ...
 def RawValue(typecode_or_type, *args): ...
 def RawArray(typecode_or_type, size_or_initializer): ...
 def Value(typecode_or_type, *args, **kwds): ...
--- a/stdlib/2/multiprocessing/process.pyi
+++ b/stdlib/2/multiprocessing/process.pyi
@@ -1,14 +1,15 @@
-from typing import Any
+from typing import Any, Optional

 def current_process(): ...
 def active_children(): ...

 class Process:
-    def __init__(self, group=None, target=None, name=None, args=..., kwargs=...): ...
+    def __init__(self, group: Optional[Any] = ..., target: Optional[Any] = ..., name: Optional[Any] = ..., args=...,
+                 kwargs=...): ...
    def run(self): ...
    def start(self): ...
    def terminate(self): ...
-    def join(self, timeout=None): ...
+    def join(self, timeout: Optional[Any] = ...): ...
    def is_alive(self): ...
    @property
    def name(self): ...
--- a/stdlib/2/multiprocessing/util.pyi
+++ b/stdlib/2/multiprocessing/util.pyi
@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional
 import threading

 SUBDEBUG = ...  # type: Any
@@ -9,13 +9,13 @@ def debug(msg, *args): ...
 def info(msg, *args): ...
 def sub_warning(msg, *args): ...
 def get_logger(): ...
-def log_to_stderr(level=None): ...
+def log_to_stderr(level: Optional[Any] = ...): ...
 def get_temp_dir(): ...
 def register_after_fork(obj, func): ...

 class Finalize:
-    def __init__(self, obj, callback, args=..., kwargs=None, exitpriority=None): ...
-    def __call__(self, wr=None): ...
+    def __init__(self, obj, callback, args=..., kwargs: Optional[Any] = ..., exitpriority: Optional[Any] = ...): ...
+    def __call__(self, wr: Optional[Any] = ...): ...
    def cancel(self): ...
    def still_active(self): ...

--- a/stdlib/2/platform.pyi
+++ b/stdlib/2/platform.pyi
@@ -2,13 +2,13 @@
 #
 # Based on stub generated by stubgen.

-from typing import Any
+from typing import Any, Optional

 __copyright__ = ...  # type: Any
 DEV_NULL = ...  # type: Any

-def libc_ver(executable=..., lib=..., version=..., chunksize=2048): ...
-def linux_distribution(distname=..., version=..., id=..., supported_dists=..., full_distribution_name=1): ...
+def libc_ver(executable=..., lib=..., version=..., chunksize: int = ...): ...
+def linux_distribution(distname=..., version=..., id=..., supported_dists=..., full_distribution_name: int = ...): ...
 def dist(distname=..., version=..., id=..., supported_dists=...): ...

 class _popen:
@@ -16,13 +16,13 @@ class _popen:
    pipe = ...  # type: Any
    bufsize = ...  # type: Any
    mode = ...  # type: Any
-    def __init__(self, cmd, mode=..., bufsize=None): ...
+    def __init__(self, cmd, mode=..., bufsize: Optional[Any] = ...): ...
    def read(self): ...
    def readlines(self): ...
    def close(self, remove=..., error=...): ...
    __del__ = ...  # type: Any

-def popen(cmd, mode=..., bufsize=None): ...
+def popen(cmd, mode=..., bufsize: Optional[Any] = ...): ...
 def win32_ver(release=..., version=..., csd=..., ptype=...): ...
 def mac_ver(release=..., versioninfo=..., machine=...): ...
 def java_ver(release=..., vendor=..., vminfo=..., osinfo=...): ...
@@ -42,4 +42,4 @@ def python_branch(): ...
 def python_revision(): ...
 def python_build(): ...
 def python_compiler(): ...
-def platform(aliased=0, terse=0): ...
+def platform(aliased: int = ..., terse: int = ...): ...
--- a/stdlib/2/rfc822.pyi
+++ b/stdlib/2/rfc822.pyi
@@ -2,14 +2,14 @@
 #
 # Based on stub generated by stubgen.

-from typing import Any
+from typing import Any, Optional

 class Message:
    fp = ...  # type: Any
    seekable = ...  # type: Any
    startofheaders = ...  # type: Any
    startofbody = ...  # type: Any
-    def __init__(self, fp, seekable=1): ...
+    def __init__(self, fp, seekable: int = ...): ...
    def rewindbody(self): ...
    dict = ...  # type: Any
    unixfrom = ...  # type: Any
@@ -22,7 +22,7 @@ class Message:
    def getallmatchingheaders(self, name): ...
    def getfirstmatchingheader(self, name): ...
    def getrawheader(self, name): ...
-    def getheader(self, name, default=None): ...
+    def getheader(self, name, default: Optional[Any] = ...): ...
    get = ...  # type: Any
    def getheaders(self, name): ...
    def getaddr(self, name): ...
@@ -57,11 +57,11 @@ class AddrlistClass:
    def getrouteaddr(self): ...
    def getaddrspec(self): ...
    def getdomain(self): ...
-    def getdelimited(self, beginchar, endchars, allowcomments=1): ...
+    def getdelimited(self, beginchar, endchars, allowcomments: int = ...): ...
    def getquote(self): ...
    def getcomment(self): ...
    def getdomainliteral(self): ...
-    def getatom(self, atomends=None): ...
+    def getatom(self, atomends: Optional[Any] = ...): ...
    def getphraselist(self): ...

 class AddressList(AddrlistClass):
--- a/stdlib/2/runpy.pyi
+++ b/stdlib/2/runpy.pyi
@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional

 class _TempModule:
    mod_name = ...  # type: Any
@@ -13,5 +13,5 @@ class _ModifiedArgv0:
    def __enter__(self): ...
    def __exit__(self, *args): ...

-def run_module(mod_name, init_globals=None, run_name=None, alter_sys=False): ...
-def run_path(path_name, init_globals=None, run_name=None): ...
+def run_module(mod_name, init_globals: Optional[Any] = ..., run_name: Optional[Any] = ..., alter_sys: bool = ...): ...
+def run_path(path_name, init_globals: Optional[Any] = ..., run_name: Optional[Any] = ...): ...
--- a/stdlib/2/urllib2.pyi
+++ b/stdlib/2/urllib2.pyi
@@ -82,7 +82,7 @@ class HTTPRedirectHandler(BaseHandler):


 class ProxyHandler(BaseHandler):
-    def __init__(self, proxies=None): ...
+    def __init__(self, proxies: Optional[Any] = ...): ...
    def proxy_open(self, req, proxy, type): ...

 class HTTPPasswordMgr:
@@ -138,12 +138,12 @@ class HTTPHandler(AbstractHTTPHandler):
    def http_request(self, request): ...

 class HTTPSHandler(AbstractHTTPHandler):
-    def __init__(self, debuglevel=0, context=None): ...
+    def __init__(self, debuglevel: int = ..., context: Optional[Any] = ...): ...
    def https_open(self, req): ...
    def https_request(self, request): ...

 class HTTPCookieProcessor(BaseHandler):
-    def __init__(self, cookiejar=None): ...
+    def __init__(self, cookiejar: Optional[Any] = ...): ...
    def http_request(self, request): ...
    def http_response(self, request, response): ...