From 78862840139670bdf9975246f9b1624d89cb0912 Mon Sep 17 00:00:00 2001 From: m29538 Date: Mon, 8 Jan 2024 17:05:33 -0500 Subject: [PATCH] fix configuration and tests --- docs/source/conf.py | 5 +++-- mediawiki/configuraton.py | 11 +++++++---- mediawiki/mediawiki.py | 5 +++-- scripts/generate_test_data.py | 4 ++-- setup.py | 2 +- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 3b0dbdc..8cabad6 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -15,6 +15,7 @@ import os import sys +from typing import Dict, List # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -88,7 +89,7 @@ # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. # This patterns also effect to html_static_path and html_extra_path -exclude_patterns = [] +exclude_patterns: List[str] = [] # The reST default role (used for this markup: `text`) to use for all # documents. @@ -224,7 +225,7 @@ # -- Options for LaTeX output --------------------------------------------- -latex_elements = { +latex_elements: Dict[str, str] = { # The paper size ('letterpaper' or 'a4paper'). #'papersize': 'letterpaper', # The font size ('10pt', '11pt' or '12pt'). diff --git a/mediawiki/configuraton.py b/mediawiki/configuraton.py index f0a337e..89cb066 100644 --- a/mediawiki/configuraton.py +++ b/mediawiki/configuraton.py @@ -98,14 +98,17 @@ def lang(self) -> str: @lang.setter def lang(self, lang: str): - lang = lang.lower() - if self._lang == lang: + print(f"lang setter: {lang}") + t_lang = lang.lower() + print(f"t_lang setter: {t_lang}") + if self._lang == t_lang: + print("non-change") return url = self._api_url - tmp = url.replace(f"/{self._lang}.", f"/{lang}.") + tmp = url.replace(f"/{self._lang}.", f"/{t_lang}.") self.api_url = tmp - self._lang = lang + self._lang = t_lang self._clear_memoized - True @property diff --git a/mediawiki/mediawiki.py b/mediawiki/mediawiki.py index 87f9580..513703e 100644 --- a/mediawiki/mediawiki.py +++ b/mediawiki/mediawiki.py @@ -78,7 +78,7 @@ def __init__( url.format(lang=lang.lower()) self._config = Configuration( lang=lang, - api_url=url.format(lang=lang), + api_url=url.format(lang=lang.lower()), category_prefix=cat_prefix, timeout=timeout, proxies=proxies, @@ -235,7 +235,8 @@ def language(self) -> str: @language.setter def language(self, lang: str): """Set the language to use; attempts to change the API URL""" - self._config.lang == lang + print(f"language setter: {lang}") + self._config.lang = lang if self._config._clear_memoized: self.clear_memoized() self._config._clear_memoized = False diff --git a/scripts/generate_test_data.py b/scripts/generate_test_data.py index f5c2e3d..0eb5de7 100644 --- a/scripts/generate_test_data.py +++ b/scripts/generate_test_data.py @@ -269,12 +269,12 @@ def _post_response(self, params): if PULL_ALL is True or PULL_CATEGORYTREE is True: site.rate_limit = True - ct = site.categorytree(["Chess", "Ebola"], depth=None) + ct = site.categorytree(["Chess", "Ebola"], depth=None) # type: ignore with open(CATTREE_FILE, "w") as fp: json.dump(ct, fp, ensure_ascii=False, sort_keys=True) try: - site.categorytree("Chess Ebola", depth=None) + site.categorytree("Chess Ebola", depth=None) # type: ignore except Exception as ex: responses[site.api_url]["missing_categorytree"] = str(ex) site.rate_limit = False diff --git a/setup.py b/setup.py index 6068493..0936043 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,3 @@ -from setuptools import setup +from setuptools import setup # type: ignore setup()