From a09110f54afdbb999ef23c9223a19235a6897534 Mon Sep 17 00:00:00 2001 From: Arnav Mandal Date: Wed, 22 Mar 2023 16:30:13 +0530 Subject: [PATCH] Update bitarray version to support python 3.7+ * update bitarray to 2.7.3 * change `from bitarray import bitdiff` to `from bitarray.util import count_xor` Signed-off-by: Arnav Mandal --- misc/scancode-fingerprint/setup.py | 5 ++--- .../src/plugin_fingerprint/fingerprint.py | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/misc/scancode-fingerprint/setup.py b/misc/scancode-fingerprint/setup.py index abcb5b0..8c92665 100644 --- a/misc/scancode-fingerprint/setup.py +++ b/misc/scancode-fingerprint/setup.py @@ -43,12 +43,11 @@ ], install_requires=[ 'scancode-toolkit', + 'bitarray==2.7.3' ], entry_points={ 'scancode_scan': [ 'fingerprint = plugin_fingerprint.plugin_fingerprint:FingerprintScanner', ], } - - -) +) \ No newline at end of file diff --git a/misc/scancode-fingerprint/src/plugin_fingerprint/fingerprint.py b/misc/scancode-fingerprint/src/plugin_fingerprint/fingerprint.py index 5344f75..fda9c80 100644 --- a/misc/scancode-fingerprint/src/plugin_fingerprint/fingerprint.py +++ b/misc/scancode-fingerprint/src/plugin_fingerprint/fingerprint.py @@ -24,7 +24,7 @@ import binascii from bitarray import bitarray -from bitarray import bitdiff +from bitarray.util import count_xor import hashlib from commoncode.text import toascii @@ -141,7 +141,7 @@ def hamming_distance(self, fingerprint1, fingerprint2): Hamming distance is the difference in the bits of two binary string. Files with fingerprints whose hamming distance are less tends to be more similar. """ - distance = bitdiff(fingerprint1, fingerprint2) + distance = count_xor(fingerprint1, fingerprint2) result = int(distance) return result