jenkins-bot submitted this change.

View Change

[IMPR] Rewrite pywikibot scripts to support Python 3.5+ only

Bug: T257399
Change-Id: Ic550d5d58f6ca55b646c2308a2b1090c7e68c489
---
M scripts/spamremove.py
M scripts/standardize_interwiki.py
M scripts/states_redirect.py
M scripts/surnames_redirects.py
4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/scripts/spamremove.py b/scripts/spamremove.py
index ec67bad..2eb8f29 100755
--- a/scripts/spamremove.py
+++ b/scripts/spamremove.py
@@ -29,12 +29,10 @@
 &params;
 """
 #
-# (C) Pywikibot team, 2007-2019
+# (C) Pywikibot team, 2007-2020
 #
 # Distributed under the terms of the MIT license.
 #
-from __future__ import absolute_import, division, unicode_literals
-
 import pywikibot
 
 from pywikibot import pagegenerators
@@ -54,22 +52,20 @@
     @param generator: page generator with preloaded pages.
     @type generator: generator
     @param spam_external_url: an external url
-    @type spam_external_url: str
     @keyword summary: summary message when given. Otherwise the default
         summary will be used
-    @type summary: str
     @keyword always: Don't ask for text replacements
     @type always: bool
     """
 
     summary_key = 'spamremove-remove'
 
-    def __init__(self, generator, spam_external_url, **kwargs):
+    def __init__(self, generator, spam_external_url: str, **kwargs):
         """Initializer."""
         self.available_options.update({
             'summary': None,
         })
-        super(SpamRemoveBot, self).__init__(**kwargs)
+        super().__init__(**kwargs)
         self.generator = generator
         self.spam_external_url = spam_external_url
         self.changed_pages = 0
diff --git a/scripts/standardize_interwiki.py b/scripts/standardize_interwiki.py
index 3bb0f32..84775bb 100644
--- a/scripts/standardize_interwiki.py
+++ b/scripts/standardize_interwiki.py
@@ -8,12 +8,10 @@
 -start:     - Set from what page you want to start
 """
 #
-# (C) Pywikibot team, 2003-2019
+# (C) Pywikibot team, 2003-2020
 #
 # Distributed under the terms of the MIT license.
 #
-from __future__ import absolute_import, division, unicode_literals
-
 import pywikibot
 
 from pywikibot import i18n, textlib
diff --git a/scripts/states_redirect.py b/scripts/states_redirect.py
index c0a0a73..6edd0ab 100755
--- a/scripts/states_redirect.py
+++ b/scripts/states_redirect.py
@@ -16,12 +16,10 @@
 * Install with pip: pip install pycountry
 """
 #
-# (C) Pywikibot team, 2004-2019
+# (C) Pywikibot team, 2004-2020
 #
 # Distributed under the terms of the MIT license.
 #
-from __future__ import absolute_import, division, unicode_literals
-
 import re
 
 import pywikibot
@@ -39,15 +37,13 @@
 
     """Bot class used for implementation of re-direction norms."""
 
-    def __init__(self, start, force):
+    def __init__(self, start: str, force: bool):
         """Initializer.
 
         @param start:xxx Specify the place in the alphabet to start searching.
-        @type start: str
         @param force: Don't ask whether to create pages, just create them.
-        @type force: bool
         """
-        super(StatesRedirectBot, self).__init__()
+        super().__init__()
         self.start = start
         self.force = force
 
@@ -71,7 +67,7 @@
         if so, create a redirect from Something, ST..
         """
         for sn in self.abbrev:
-            if re.search(r', %s$' % sn, page.title()):
+            if re.fullmatch(r', %s' % sn, page.title()):
                 pl = pywikibot.Page(self.site, page.title().replace(sn,
                                     self.abbrev[sn]))
                 # A bit hacking here - the real work is done in the
diff --git a/scripts/surnames_redirects.py b/scripts/surnames_redirects.py
index e14ba51..a0a1cd1 100755
--- a/scripts/surnames_redirects.py
+++ b/scripts/surnames_redirects.py
@@ -18,12 +18,10 @@
     python pwb.py surnames_redirects -start:B
 """
 #
-# (C) Pywikibot team, 2017-2019
+# (C) Pywikibot team, 2017-2020
 #
 # Distributed under the terms of the MIT license.
 #
-from __future__ import absolute_import, division, unicode_literals
-
 from difflib import SequenceMatcher
 
 import pywikibot
@@ -50,7 +48,7 @@
             'surnames_last': False,
         })
 
-        super(SurnamesBot, self).__init__(generator=generator, **kwargs)
+        super().__init__(generator=generator, **kwargs)
 
     def treat_page(self):
         """Suggest redirects by reordering names in titles."""

To view, visit change 639880. To unsubscribe, or for help writing mail filters, visit settings.