jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1033690?usp=email )
Change subject: [IMPR] remove unnecessary else after return/raise
......................................................................
[IMPR] remove unnecessary else after return/raise
Change-Id: I89911e8d674602c856e47e8dc23877ed849500dc
---
M pywikibot/__init__.py
M pywikibot/cosmetic_changes.py
M pywikibot/page/_basepage.py
M pywikibot/page/_wikibase.py
M pywikibot/proofreadpage.py
M pywikibot/site/_siteinfo.py
M pywikibot/textlib.py
M scripts/checkimages.py
M scripts/coordinate_import.py
M scripts/interwikidata.py
10 files changed, 28 insertions(+), 29 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index f03fef5..569889b 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -231,8 +231,8 @@
tmp = __import__('pywikibot.site', fromlist=[interface])
except ImportError:
raise ValueError(f'Invalid interface name: {interface}')
- else:
- interface = getattr(tmp, interface)
+
+ interface = getattr(tmp, interface)
if not issubclass(interface, _BaseSite):
warning(f'Site called with interface={interface.__name__}')
diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py
index e18a3ae..c966cdc 100644
--- a/pywikibot/cosmetic_changes.py
+++ b/pywikibot/cosmetic_changes.py
@@ -309,10 +309,10 @@
pywikibot.error(e)
return False
raise
- else:
- if self.show_diff:
- pywikibot.showDiff(text, new_text)
- return new_text
+
+ if self.show_diff:
+ pywikibot.showDiff(text, new_text)
+ return new_text
def fixSelfInterwiki(self, text: str) -> str:
"""
diff --git a/pywikibot/page/_basepage.py b/pywikibot/page/_basepage.py
index 1c51f20..61623b6 100644
--- a/pywikibot/page/_basepage.py
+++ b/pywikibot/page/_basepage.py
@@ -1764,8 +1764,8 @@
lastmove = next(gen)
except StopIteration:
raise NoMoveTargetError(self)
- else:
- return lastmove.target_page
+
+ return lastmove.target_page
def revisions(self,
reverse: bool = False,
diff --git a/pywikibot/page/_wikibase.py b/pywikibot/page/_wikibase.py
index 1f9ed9a..8f3bd66 100644
--- a/pywikibot/page/_wikibase.py
+++ b/pywikibot/page/_wikibase.py
@@ -477,8 +477,8 @@
error_message = str(exc)
if 'is not a file' in error_message:
raise NoWikibaseEntityError(self) from exc
- else:
- raise Error(self) from exc
+
+ raise Error(self) from exc
# Create _content. Format is same as with wbgetentities
#
https://commons.wikimedia.org/w/api.php?action=wbgetentities&ids=M20985340
diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py
index e75f397..84d4e60 100644
--- a/pywikibot/proofreadpage.py
+++ b/pywikibot/proofreadpage.py
@@ -848,10 +848,8 @@
url_image = url_image['src']
except (TypeError, AttributeError):
raise ValueError(f'No prp-page-image src found for {self}.')
- else:
- url_image = 'https:' + url_image
- return url_image
+ return 'https:' + url_image
def _url_image_ge_140(self) -> str:
"""Get the file url of the scan of ProofreadPage.
@@ -865,8 +863,8 @@
url = self._imageforpage.get('fullsize')
if url is not None:
return f'{self.site.family.protocol(self.site.code)}:{url}'
- else:
- raise ValueError(f'imagesforpage is empty for {self}.')
+
+ raise ValueError(f'imagesforpage is empty for {self}.')
@property
@cached
diff --git a/pywikibot/site/_siteinfo.py b/pywikibot/site/_siteinfo.py
index 5f58640..d0e92e1 100644
--- a/pywikibot/site/_siteinfo.py
+++ b/pywikibot/site/_siteinfo.py
@@ -303,8 +303,8 @@
self._get_cached(key)
except KeyError:
return False
- else:
- return True
+
+ return True
def __contains__(self, key: str) -> bool:
"""Return whether the value is in Siteinfo container.
@@ -316,8 +316,8 @@
self[key]
except KeyError:
return False
- else:
- return True
+
+ return True
def is_recognised(self, key: str) -> bool | None:
"""Return if 'key' is a valid property name. 'None' if not cached."""
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index 8cc33a7..29cd9df 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -2276,8 +2276,8 @@
f"incorrect month name {dateDict['month']['value']!r} "
f'in page in site {self.site}'
)
- else:
- dateDict['month']['value'] = value
+
+ dateDict['month']['value'] = value
# convert to integers and remove the inner dict
for k, v in dateDict.items():
diff --git a/scripts/checkimages.py b/scripts/checkimages.py
index b105b16..e5d0d87 100755
--- a/scripts/checkimages.py
+++ b/scripts/checkimages.py
@@ -1150,7 +1150,7 @@
try:
self.all_licenses.remove(template)
except ValueError:
- return False
+ pass
else:
self.white_templates_found = True
return False
diff --git a/scripts/coordinate_import.py b/scripts/coordinate_import.py
index 1239cda..e517afa 100755
--- a/scripts/coordinate_import.py
+++ b/scripts/coordinate_import.py
@@ -44,7 +44,7 @@
¶ms;
"""
#
-# (C) Pywikibot team, 2013-2023
+# (C) Pywikibot team, 2013-2024
#
# Distributed under the terms of MIT license.
#
@@ -144,14 +144,15 @@
newclaim.addSource(source)
pywikibot.info(
f'Adding {coordinate.lat}, {coordinate.lon} to {item.title()}')
+
# todo: handle exceptions using self.user_add_claim
try:
item.addClaim(newclaim)
except CoordinateGlobeUnknownError as e:
pywikibot.info(f'Skipping unsupported globe: {e.args}')
return False
- else:
- return True
+
+ return True
def main(*args: str) -> None:
diff --git a/scripts/interwikidata.py b/scripts/interwikidata.py
index 7d4cf00..a20f72f 100755
--- a/scripts/interwikidata.py
+++ b/scripts/interwikidata.py
@@ -29,7 +29,7 @@
can be set within a settings file which is scripts.ini by default.
"""
-# (C) Pywikibot team, 2015-2023
+# (C) Pywikibot team, 2015-2024
#
# Distributed under the terms of the MIT license.
#
@@ -229,9 +229,9 @@
except APIError:
# warning already printed by the API
return False
- else:
- target_item.get(force=True)
- return target_item
+
+ target_item.get(force=True)
+ return target_item
def main(*args: str) -> None:
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1033690?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I89911e8d674602c856e47e8dc23877ed849500dc
Gerrit-Change-Number: 1033690
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: D3r1ck01 <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
