From 5f4cfe23df20426d00df33bfafc34db173f3b56b Mon Sep 17 00:00:00 2001 From: barrust Date: Sun, 7 Jan 2024 16:59:16 -0500 Subject: [PATCH] use comprehensions --- mediawiki/mediawiki.py | 7 +++---- mediawiki/mediawikipage.py | 6 +++--- mediawiki/utilities.py | 4 +--- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/mediawiki/mediawiki.py b/mediawiki/mediawiki.py index fcab398..abcc392 100644 --- a/mediawiki/mediawiki.py +++ b/mediawiki/mediawiki.py @@ -223,7 +223,6 @@ def timeout(self) -> float: @timeout.setter def timeout(self, timeout: float): """Set request timeout in seconds (or fractions of a second)""" - self._timeout = None if timeout is None else float(timeout) @property @@ -881,9 +880,8 @@ def _get_site_info(self): api_version = gen["generator"].split(" ")[1].split("-")[0] - major_minor = api_version.split(".") - for i, item in enumerate(major_minor): - major_minor[i] = int(item) + major_minor = [int(i) for i in api_version.split(".")] + self._api_version = tuple(major_minor) self._api_version_str = ".".join([str(x) for x in self._api_version]) @@ -969,6 +967,7 @@ def __cat_tree_rec( raise exc except Exception: tries = tries + 1 + # TODO: Should this really sleep? time.sleep(1) else: parent_cats = categories[cat].categories diff --git a/mediawiki/mediawikipage.py b/mediawiki/mediawikipage.py index efeaeda..b288a76 100644 --- a/mediawiki/mediawikipage.py +++ b/mediawiki/mediawikipage.py @@ -253,18 +253,17 @@ def images(self) -> List[str]: Note: Not settable""" if self._images is None: - self._images = [] params = { "generator": "images", "gimlimit": "max", "prop": "imageinfo", # this will be replaced by fileinfo "iiprop": "url", } - self._images.extend( + self._images = [ page["imageinfo"][0]["url"] for page in self._continued_query(params) if "imageinfo" in page and "url" in page["imageinfo"][0] - ) + ] self._images = sorted(self._images) return self._images @@ -527,6 +526,7 @@ def section(self, section_title: Optional[str]) -> Optional[str]: else: section = f"== {section_title} ==" try: + # TODO, move index to find to remove exceptions content = self.content index = content.index(section) + len(section) diff --git a/mediawiki/utilities.py b/mediawiki/utilities.py index 2557211..b35e791 100644 --- a/mediawiki/utilities.py +++ b/mediawiki/utilities.py @@ -75,6 +75,4 @@ def str_or_unicode(text: str) -> str: def is_relative_url(url: str) -> Optional[bool]: """simple method to determine if a url is relative or absolute""" - if url.startswith("#"): - return None - return url.find("://") <= 0 and not url.startswith("//") + return url.find("://") <= 0 and not url.startswith("//") if not url.startswith("#") else None