diff --git a/d2warehouse/huffman.py b/d2warehouse/huffman.py index fec76ae..2f2e37d 100644 --- a/d2warehouse/huffman.py +++ b/d2warehouse/huffman.py @@ -62,9 +62,9 @@ decode_tree = decodetree(code) def decode(bits: bitarray, n) -> tuple[str, int]: - s = "".join(itertools.islice(bits.iterdecode(decode_tree), n)) - l = len(encode(s)) - return s, l + text = "".join(itertools.islice(bits.iterdecode(decode_tree), n)) + length = len(encode(text)) + return text, length def encode(s: str) -> bitarray: diff --git a/d2warehouse/item.py b/d2warehouse/item.py index d98b814..d8cd087 100644 --- a/d2warehouse/item.py +++ b/d2warehouse/item.py @@ -62,7 +62,7 @@ class Stat: for val in self.values: subst_text = subst_text.replace("#", str(val), 1) if self.parameter: - subst_text = re.sub("\[[^\]]*\]", str(self.parameter), subst_text, 1) + subst_text = re.sub(r"\[[^\]]*\]", str(self.parameter), subst_text, 1) print(" " * indent, subst_text) diff --git a/d2warehouse/stash.py b/d2warehouse/stash.py index c043aba..ff04afd 100644 --- a/d2warehouse/stash.py +++ b/d2warehouse/stash.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU General Public License along with # Mercator. If not, see . -from bitarray import bitarray +from d2warehouse.item import Item class Stash: diff --git a/pyproject.toml b/pyproject.toml index 45206c2..3f02014 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ classifiers = [ "Environment :: Console", ] -requires-python = ">=3.9" +requires-python = ">=3.10" license = {text = "GPLv3 License"} dependencies = [ "bitarray",