From 360497f9f3691ab8287c14cca35a554a906841ea Mon Sep 17 00:00:00 2001
From: hauntsaninja <>
Date: Sun, 19 Jan 2020 15:30:24 -0600
Subject: [PATCH 1/3] hashlib: fix argument names

---
 stdlib/3/hashlib.pyi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/stdlib/3/hashlib.pyi b/stdlib/3/hashlib.pyi
index 616bb0fdee22..8a5e8bed8b13 100644
--- a/stdlib/3/hashlib.pyi
+++ b/stdlib/3/hashlib.pyi
@@ -21,12 +21,12 @@ class _Hash(object):
     def hexdigest(self) -> str: ...
     def update(self, arg: _DataType) -> None: ...
 
-def md5(arg: _DataType = ...) -> _Hash: ...
-def sha1(arg: _DataType = ...) -> _Hash: ...
-def sha224(arg: _DataType = ...) -> _Hash: ...
-def sha256(arg: _DataType = ...) -> _Hash: ...
-def sha384(arg: _DataType = ...) -> _Hash: ...
-def sha512(arg: _DataType = ...) -> _Hash: ...
+def md5(string: _DataType = ...) -> _Hash: ...
+def sha1(string: _DataType = ...) -> _Hash: ...
+def sha224(string: _DataType = ...) -> _Hash: ...
+def sha256(string: _DataType = ...) -> _Hash: ...
+def sha384(string: _DataType = ...) -> _Hash: ...
+def sha512(string: _DataType = ...) -> _Hash: ...
 
 def new(name: str, data: _DataType = ...) -> _Hash: ...
 

From bb20c386c3bd1c15cebb1294759312887e3a6dd1 Mon Sep 17 00:00:00 2001
From: hauntsaninja <>
Date: Sun, 19 Jan 2020 15:30:33 -0600
Subject: [PATCH 2/3] hashlib: add default values to scrypt, make args Optional

---
 stdlib/3/hashlib.pyi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stdlib/3/hashlib.pyi b/stdlib/3/hashlib.pyi
index 8a5e8bed8b13..a0fe25963a83 100644
--- a/stdlib/3/hashlib.pyi
+++ b/stdlib/3/hashlib.pyi
@@ -55,7 +55,7 @@ if sys.version_info >= (3, 6):
     shake_128 = _VarLenHash
     shake_256 = _VarLenHash
 
-    def scrypt(password: _DataType, *, salt: _DataType, n: int, r: int, p: int, maxmem: int = ..., dklen: int = ...) -> bytes: ...
+    def scrypt(password: _DataType, *, salt: Optional[_DataType] = ..., n: Optional[int] = ..., r: Optional[int] = ..., p: Optional[int] = ..., maxmem: int = ..., dklen: int = ...) -> bytes: ...
 
     class _BlakeHash(_Hash):
         MAX_DIGEST_SIZE: int

From 24b2387c451bdc7af86fafddf87c8f76b89c9e3e Mon Sep 17 00:00:00 2001
From: hauntsaninja <>
Date: Tue, 21 Jan 2020 16:51:57 -0600
Subject: [PATCH 3/3] hashlib: make args positional-only before py37

---
 stdlib/3/hashlib.pyi | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/stdlib/3/hashlib.pyi b/stdlib/3/hashlib.pyi
index a0fe25963a83..a0bc13cc7bd8 100644
--- a/stdlib/3/hashlib.pyi
+++ b/stdlib/3/hashlib.pyi
@@ -21,12 +21,20 @@ class _Hash(object):
     def hexdigest(self) -> str: ...
     def update(self, arg: _DataType) -> None: ...
 
-def md5(string: _DataType = ...) -> _Hash: ...
-def sha1(string: _DataType = ...) -> _Hash: ...
-def sha224(string: _DataType = ...) -> _Hash: ...
-def sha256(string: _DataType = ...) -> _Hash: ...
-def sha384(string: _DataType = ...) -> _Hash: ...
-def sha512(string: _DataType = ...) -> _Hash: ...
+if sys.version_info >= (3, 8):
+    def md5(string: _DataType = ...) -> _Hash: ...
+    def sha1(string: _DataType = ...) -> _Hash: ...
+    def sha224(string: _DataType = ...) -> _Hash: ...
+    def sha256(string: _DataType = ...) -> _Hash: ...
+    def sha384(string: _DataType = ...) -> _Hash: ...
+    def sha512(string: _DataType = ...) -> _Hash: ...
+else:
+    def md5(__string: _DataType = ...) -> _Hash: ...
+    def sha1(__string: _DataType = ...) -> _Hash: ...
+    def sha224(__string: _DataType = ...) -> _Hash: ...
+    def sha256(__string: _DataType = ...) -> _Hash: ...
+    def sha384(__string: _DataType = ...) -> _Hash: ...
+    def sha512(__string: _DataType = ...) -> _Hash: ...
 
 def new(name: str, data: _DataType = ...) -> _Hash: ...