Xqt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/183792

Change subject: [IMPROV] minor code improvements
......................................................................

[IMPROV] minor code improvements

- remove unused globals
- use isCategory() instead of hardcoded namespace number
- use explicit variables instead of implizit locals()

Change-Id: Ifd2d9fc1c84cbe673fa5711eb035942d5e926475
---
M scripts/category_redirect.py
1 file changed, 6 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/92/183792/1

diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py
index 87d8693..b43af2e 100755
--- a/scripts/category_redirect.py
+++ b/scripts/category_redirect.py
@@ -228,7 +228,7 @@
                 # race condition: someone else removed the redirect while we
                 # were checking for it
                 continue
-            if target.namespace() == 14:
+            if target.isCategory():
                 # this is a hard-redirect to a category page
                 newtext = (u"{{%(template)s|%(cat)s}}"
                            % {'cat': target.title(withNamespace=False),
@@ -252,7 +252,6 @@
 
     def run(self):
         """Run the bot."""
-        global destmap, catlist, catmap
 
         # validate L10N
         try:
@@ -266,14 +265,13 @@
             pywikibot.warning(u"No redirect category found for %s" % self.site)
             return
 
-        # user() invokes login()
-        user = self.site.user()
+        user = self.site.user()  # invokes login()
         newredirs = []
 
         l = time.localtime()
         today = "%04d-%02d-%02d" % l[:3]
         edit_request_page = pywikibot.Page(
-            self.site, u"User:%(user)s/category edit requests" % locals())
+            self.site, u"User:%s/category edit requests" % user)
         datafile = pywikibot.config.datafilepath("%s-catmovebot-data"
                                                  % self.site.dbName())
         try:
@@ -302,8 +300,8 @@
         self.check_hard_redirect()
 
         comment = i18n.twtranslate(self.site.code, self.move_comment)
-        counts, destmap, catmap = {}, {}, {}
-        catlist, nonemptypages = [], []
+        counts = {}
+        nonemptypages = []
         redircat = pywikibot.Category(pywikibot.Link(self.cat_title, 
self.site))
 
         pywikibot.output(u"\nChecking %d category redirect pages"
@@ -344,8 +342,7 @@
                                   self.catprefix + cat_name) not in catpages:
                 del record[cat_name]
 
-        pywikibot.output(u"")
-        pywikibot.output(u"Moving pages out of %s redirected categories."
+        pywikibot.output(u"\nMoving pages out of %s redirected categories."
                          % len(nonemptypages))
 
         for cat in pagegenerators.PreloadingGenerator(nonemptypages):

-- 
To view, visit https://gerrit.wikimedia.org/r/183792
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd2d9fc1c84cbe673fa5711eb035942d5e926475
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <i...@gno.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to