Merge pull request #1195 from stonebig/master

stonebig · web-flow · commit 196352301b27 · 2023-02-12T12:50:19.000+01:00
move from sha3 to blake2b like pypi
diff --git a/hash.py b/hash.py
@@ -15,6 +15,10 @@ def give_hash(file_in, with_this):
     with io.open(file_in, 'rb') as f:
         return with_this(f.read()).hexdigest()
 
+def give_hashblake(file_in, with_this):
+    with io.open(file_in, 'rb') as f:
+        return with_this(f.read(),digest_size=32).hexdigest()
+
 
 if __name__ == '__main__':
     if len(sys.argv) < 2:
@@ -37,8 +41,10 @@ def give_hash(file_in, with_this):
         + " " * (33 - 5)
         + "| Size"
         + " " * (20 - 6)
-        + " | SHA3-256"
-        + " " * (64 - 7)
+        #+ " | SHA3-256"
+        #+ " " * (64 - 8)
+        + " | blake2b-256"
+        + " " * (64 - 11)
    )
     line = "|".join(
         ["-" * len(i) for i in header.split("|")]
@@ -52,7 +58,9 @@ def give_hash(file_in, with_this):
         f"{give_hash(file, hashlib.sha1)} | " +
         f"{give_hash(file, hashlib.sha256)} | " +
         f"{os.path.basename(file):33} |"+
-		f"{os.path.getsize(file):13,}".replace(",", " ") +  ' Bytes'   + f" | {give_hash(file, hashlib.sha3_256)}")
+		f"{os.path.getsize(file):13,}".replace(",", " ") +  ' Bytes | '   +
+        # f" | {give_hash(file, hashlib.sha3_256)}"
+        f"{give_hashblake(file, hashlib.blake2b)}")
         
          
 
diff --git a/hash_launch.bat b/hash_launch.bat
@@ -1,4 +1,4 @@
-call C:\WinPython-64bit-3.6.8.0\scripts\env.bat
+call C:\WPy64-3890\scripts\env.bat
 
 cd %~dp0
 
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '6.0.20230204'
+__version__ = '6.0.20230212'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-call C:\WinPython-64bit-3.6.8.0\scripts\env.bat`
	`1`	`+call C:\WPy64-3890\scripts\env.bat`
`2`	`2`
`3`	`3`	`cd %~dp0`
`4`	`4`