Mercurial > hgrepos > Python > apps > py-cutils
changeset 185:f04d4b1c14b3
FIX: "digest" had overwritteh the digest module
| author | Franz Glasner <fzglas.hg@dom66.de> |
|---|---|
| date | Tue, 14 Jan 2025 11:35:18 +0100 |
| parents | 6154b8e4ba94 |
| children | 5c5c0c5a7402 |
| files | cutils/shasum.py cutils/util/__init__.py |
| diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/cutils/shasum.py Tue Jan 14 11:26:38 2025 +0100 +++ b/cutils/shasum.py Tue Jan 14 11:35:18 2025 +0100 @@ -24,7 +24,7 @@ from . import (__version__, __revision__) from . import util -from .util import digest +from .util import digest as digestmod def main(argv=None): @@ -177,7 +177,7 @@ for fn in dirfiles: path = os.path.join(dirpath, fn) out(opts.dest or sys.stdout, - digest.compute_digest_file( + digestmod.compute_digest_file( opts.algorithm[0], path, use_mmap=opts.mmap), path, opts.algorithm[1], @@ -193,7 +193,7 @@ else: source = sys.stdin.buffer out(sys.stdout, - digest.compute_digest_stream(opts.algorithm[0], source), + digestmod.compute_digest_stream(opts.algorithm[0], source), None, opts.algorithm[1], True, @@ -201,7 +201,7 @@ else: for fn in opts.files: out(opts.dest or sys.stdout, - digest.compute_digest_file( + digestmod.compute_digest_file( opts.algorithm[0], fn, use_mmap=opts.mmap), fn, opts.algorithm[1], @@ -267,7 +267,7 @@ print("-: MISSING", file=dest) else: tag, algo, cl_filename, cl_digest = pl - computed_digest = digest.compute_digest_stream(algo, source) + computed_digest = digestmod.compute_digest_stream(algo, source) if compare_digests_equal(computed_digest, cl_digest, algo): res = "OK" else: @@ -283,7 +283,7 @@ exit_code = 1 else: tag, algo, cl_filename, cl_digest = pl - computed_digest = digest.compute_digest_file( + computed_digest = digestmod.compute_digest_file( algo, fn, use_mmap=opts.mmap) if compare_digests_equal(computed_digest, cl_digest, algo): res = "OK" @@ -340,7 +340,7 @@ assert opts.allow_distinfo return (None, None, tag) try: - d = digest.compute_digest_file(algo, fn, use_mmap=opts.mmap) + d = digestmod.compute_digest_file(algo, fn, use_mmap=opts.mmap) if compare_digests_equal(d, digest, algo): return ("ok", fn, tag) else:
--- a/cutils/util/__init__.py Tue Jan 14 11:26:38 2025 +0100 +++ b/cutils/util/__init__.py Tue Jan 14 11:35:18 2025 +0100 @@ -163,7 +163,7 @@ "crc64-go-iso", "crc-64-go-iso"): return (get_crc("crc-64-go"), "CRC-64-GO-ISO") elif s in ("crc64-redis", "crc-64-redis"): - return (get_crc("crc-64-redis"), "CRC-64-REDIS") + return (get_crc("crc-64-redis"), "CRC-64-REDIS") else: raise argparse.ArgumentTypeError( "`{}' is not a recognized algorithm".format(s)) @@ -223,7 +223,7 @@ elif s == "CRC-64-GO-ISO": return get_crc("crc-64-go") elif s == "CRC-64-REDIS": - return get_crc("crc-64-redis") + return get_crc("crc-64-redis") else: raise ValueError("unknown algorithm: {}".format(s))