Mdupont has uploaded a new change for review.
https://gerrit.wikimedia.org/r/94477
Change subject: more lint
......................................................................
more lint
Change-Id: Iabe1bb6d64fd75e22ef029b3eae1d8875ff59a6b
---
M generate_user_files.py
M pywikibot/__init__.py
M pywikibot/bot.py
M pywikibot/botirc.py
M pywikibot/catlib.py
M pywikibot/config2.py
M pywikibot/date.py
M pywikibot/family.py
M pywikibot/i18n.py
M pywikibot/logentries.py
M pywikibot/login.py
M pywikibot/page.py
M pywikibot/pagegenerators.py
M pywikibot/site.py
M pywikibot/textlib.py
M pywikibot/throttle.py
M pywikibot/titletranslate.py
M pywikibot/userlib.py
M pywikibot/version.py
M pywikibot/xmlreader.py
M scripts/basic.py
M scripts/blockpageschecker.py
M scripts/category.py
M scripts/category_redirect.py
M scripts/cosmetic_changes.py
M scripts/data_ingestion.py
M scripts/delete.py
M scripts/editarticle.py
M scripts/featured.py
29 files changed, 164 insertions(+), 118 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/77/94477/1
diff --git a/generate_user_files.py b/generate_user_files.py
index b28f4df..3eb70e4 100644
--- a/generate_user_files.py
+++ b/generate_user_files.py
@@ -81,6 +81,8 @@
for n, i in enumerate(clist):
print ("%d: %s" % (n + 1, i))
+ choice = "ERROR"
+
while True:
choice = raw_input(message)
@@ -100,7 +102,7 @@
except:
if not isinstance(choice, basestring):
print("Invalid response")
- return response
+ return choice
def change_base_dir():
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 8fe058c..d40c9dd 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -12,10 +12,10 @@
import datetime
import difflib
-import logging
+#import logging
import math
import re
-import sys
+#import sys
import threading
from Queue import Queue
@@ -23,11 +23,12 @@
# confusion with similarly-named modules in version 1 framework, for users
# who want to continue using both
+import pywikibot
from pywikibot import config2 as config
-from pywikibot.bot import *
-from pywikibot.exceptions import *
-from pywikibot.textlib import *
-from pywikibot.i18n import translate
+from pywikibot.bot import warning, output, inputChoice
+#from pywikibot.exceptions import *
+#from pywikibot.textlib import *
+#from pywikibot.i18n import translate
class Timestamp(datetime.datetime):
@@ -309,9 +310,9 @@
getSite = Site # alias for backwards-compability
-
-from page import Page, ImagePage, Category, Link, User, ItemPage,
PropertyPage, Claim
-from page import html2unicode, url2unicode
+#Category Page, Link, User, ItemPage, PropertyPage, ImagePage, Claim
+#from page import
+#from page import html2unicode, url2unicode
link_regex = re.compile(r'\[\[(?P<title>[^\]|[<>{}]*)(\|.*?)?\]\]')
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index c6ce13a..701fe01 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -294,21 +294,7 @@
# the user console. debug() takes a required second argument, which is a
# string indicating the debugging layer.
-# next bit filched from 1.5.2's inspect.py
-def currentframe():
- """Return the frame object for the caller's stack frame."""
- try:
- raise Exception
- except:
- # go back two levels, one for logoutput and one for whatever called it
- return sys.exc_traceback.tb_frame.f_back.f_back
-if hasattr(sys, '_getframe'):
- # less portable but more efficient
- currentframe = lambda: sys._getframe(3)
- # frame0 is this lambda, frame1 is logoutput() in this module,
- # frame2 is the convenience function (output(), etc.)
- # so frame3 is whatever called the convenience function
# done filching
@@ -329,7 +315,23 @@
if not _handlers_initialized:
init_handlers()
- frame = currentframe()
+ # frame = currentframe()
+ # next bit filched from 1.5.2's inspect.py
+ frame = None
+ if hasattr(sys, '_getframe'):
+ # less portable but more efficient
+ frame = sys._getframe(3)
+ # frame0 is this lambda, frame1 is logoutput() in this module,
+ # frame2 is the convenience function (output(), etc.)
+ # so frame3 is whatever called the convenience function
+ else:
+ try:
+ raise Exception
+ except:
+ # go back two levels, one for logoutput and one for whatever
called it
+ frame = sys.exc_traceback.tb_frame.f_back
+
+
module = os.path.basename(frame.f_code.co_filename)
context = {'caller_name': frame.f_code.co_name,
'caller_file': module,
@@ -610,7 +612,7 @@
if type(getattr(config, _arg)) is not int:
raise TypeError
setattr(config, _arg, int(_val))
- except (ValueError, TypeError, AttributeError) as exc:
+ except (ValueError, TypeError, AttributeError) :
# argument not global -> specific bot script will take care
nonGlobalArgs.append(arg)
diff --git a/pywikibot/botirc.py b/pywikibot/botirc.py
index be60f38..70bcd7d 100644
--- a/pywikibot/botirc.py
+++ b/pywikibot/botirc.py
@@ -19,16 +19,12 @@
#import logging
-import logging.handlers
+#import logging.handlers
# all output goes thru python std library "logging" module
import re
from ircbot import SingleServerIRCBot
-from irclib import nm_to_n,
-#irc_lower
-#nm_to_h
-#ip_numstr_to_quad
-from irclib import ip_quad_to_numstr
+#from irclib import ip_quad_to_numstr
# logging levels
_logger = "botirc"
diff --git a/pywikibot/catlib.py b/pywikibot/catlib.py
index 067c834..683c7eb 100644
--- a/pywikibot/catlib.py
+++ b/pywikibot/catlib.py
@@ -14,7 +14,7 @@
__version__ = '$Id$'
-from pywikibot import Category
+#from pywikibot import Category
def change_category(article, oldCat, newCat, comment=None, sortKey=None,
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index af4ee98..66a256a 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -10,7 +10,7 @@
import os
import sys as __sys
import re
-import platform
+#import platform
# IMPORTANT:
# Do not change any of the variables in this file. Instead, make
@@ -114,6 +114,12 @@
"""
NAME = "pywikibot"
+
+ import os
+ import sys as __sys
+ #import re
+ import platform
+
for arg in __sys.argv[1:]:
if arg.startswith("-dir:"):
base_dir = arg[5:]
diff --git a/pywikibot/date.py b/pywikibot/date.py
index 9b27039..0829ecb 100644
--- a/pywikibot/date.py
+++ b/pywikibot/date.py
@@ -18,8 +18,14 @@
# used for date recognition
#import types
+import pywikibot
import re
+def dh_milleniumAD(x, fstr) :
+ u"""
+ I dont know this language, but you need something like inflect
+ """
+ return fstr % x
#
# Different collections of well known formats
#
diff --git a/pywikibot/family.py b/pywikibot/family.py
index 69a352a..c2822d6 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -9,7 +9,7 @@
import logging
import re
-import urllib
+#import urllib
import collections
import config2 as config
diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py
index b2952d7..1fc4dcf 100644
--- a/pywikibot/i18n.py
+++ b/pywikibot/i18n.py
@@ -407,19 +407,19 @@
},
}
#use a number
- >>> i18n.twntranslate('en', 'test-changing', 0) % {'num': 'no'}
+ >>> twntranslate('en', 'test-changing', 0) % {'num': 'no'}
Bot: Changing no pages.
#use a string
- >>> i18n.twntranslate('en', 'test-changing', '1') % {'num': 'one'}
+ >>> twntranslate('en', 'test-changing', '1') % {'num': 'one'}
Bot: Changing one page.
#use a dictionary
- >>> i18n.twntranslate('en', 'test-changing', {'num':2})
+ >>> twntranslate('en', 'test-changing', {'num':2})
Bot: Changing 2 pages.
#use additional format strings
- >>> i18n.twntranslate('fr', 'test-changing', {'num':1,
'descr':'seulement'})
+ >>> twntranslate('fr', 'test-changing', {'num':1, 'descr':'seulement'})
Bot: Changer seulement une pages.
#use format strings also outside
- >>> i18n.twntranslate('fr', 'test-changing', 0) % {'descr':'seulement'}
+ >>> twntranslate('fr', 'test-changing', 0) % {'descr':'seulement'}
Bot: Changer seulement un peu pages.
The translations are retrieved from i18n.<package>, based on the callers
diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py
index 81adb71..32dd595 100644
--- a/pywikibot/logentries.py
+++ b/pywikibot/logentries.py
@@ -9,7 +9,8 @@
#
__version__ = '$Id$'
-from pywikibot.exceptions import *
+from pywikibot.exceptions import Error
+
import pywikibot
_logger = "wiki"
diff --git a/pywikibot/login.py b/pywikibot/login.py
index 675bf49..5ddadf9 100644
--- a/pywikibot/login.py
+++ b/pywikibot/login.py
@@ -14,7 +14,7 @@
#import logging
import pywikibot
from pywikibot import config, deprecate_arg
-from pywikibot.exceptions import NoSuchSite, NoUsername
+from pywikibot.exceptions import NoUsername
_logger = "wiki.login"
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 0bbb47f..facf6ed 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -10,9 +10,11 @@
__version__ = '$Id$'
import pywikibot
+from pywikibot.exceptions import AutoblockUser, UserActionRefuse
from pywikibot import deprecate_arg
from pywikibot import deprecated
from pywikibot import config
+from pywikibot.bot import calledModuleName
import pywikibot.site
import hashlib
@@ -429,7 +431,7 @@
def previousRevision(self):
"""Return the revision id for the previous revision of this Page."""
- #vh =
+ #vh =
self.getVersionHistory(total=2)
revkey = sorted(self._revisions, reverse=True)[1]
return revkey
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index cd49d15..5547c65 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -968,7 +968,7 @@
def AncientPagesPageGenerator(number=100, repeat=False, site=None):
if site is None:
site = pywikibot.Site()
- for page, date in site.ancientpages(number=number, repeat=repeat):
+ for page, a_date in site.ancientpages(number=number, repeat=repeat):
yield page
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 933eb14..d3bb0f1 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -10,10 +10,11 @@
#
__version__ = '$Id$'
-try:
- from hashlib import md5
-except ImportError:
- from md5 import md5
+#try:
+# from hashlib import md5
+#except ImportError:
+# #from md5 import md5
+
import datetime
import itertools
import os
@@ -28,10 +29,15 @@
from pywikibot import deprecate_arg
from pywikibot import config
from pywikibot import deprecated
-from pywikibot import pagegenerators
+#from pywikibot import pagegenerators
from pywikibot.throttle import Throttle
from pywikibot.data import api
-from pywikibot.exceptions import *
+from pywikibot.exceptions import NoSuchSite, Error,
UserBlocked,NoPage,NoUsername,EditConflict, SpamfilterError, LockedPage
+
+class Captcha():
+ def input(x):
+ print x
+cap_answerwikipedia= Captcha()
_logger = "wiki.site"
@@ -885,7 +891,8 @@
def logout(self):
uirequest = api.Request(site=self, action="logout")
- uidata = uirequest.submit()
+ #uidata =
+ uirequest.submit()
self._loginstatus = LoginStatus.NOT_LOGGED_IN
if hasattr(self, "_userinfo"):
del self._userinfo
@@ -1001,7 +1008,7 @@
def has_mediawiki_message(self, key):
"""Return True iff this site defines a MediaWiki message for 'key'."""
try:
- v = self.mediawiki_message(key)
+ self.mediawiki_message(key)
return True
except KeyError:
return False
@@ -1987,13 +1994,14 @@
pywikibot.debug(
u"allpages: 'includeRedirects' argument is deprecated; use
'filterredirs'.",
_logger)
- if includeredirects:
- if includeredirects == "only":
- filterredirs = True
- else:
- filterredirs = None
- else:
- filterredirs = False
+ # if includeredirects:
+ # if includeredirects == "only":
+ # filterredirs = True
+ # else:
+ # filterredirs = None
+ # else:
+ # #filterredirs = False
+ # pass
apgen = self._generator(api.PageGenerator, type_arg="allpages",
gapnamespace=str(namespace),
@@ -2976,7 +2984,8 @@
title=page.title(withSection=False),
reason=summary)
try:
- result = req.submit()
+ #result =
+ req.submit()
except api.APIError, err:
errdata = {
'site': self,
@@ -3043,15 +3052,6 @@
"""Backwards-compatible interface to exturlusage()"""
return self.exturlusage(siteurl, total=limit)
- @deprecated('Site().logevents(logtype="upload",...)')
- @deprecate_arg("repeat", None)
- def newimages(self, number=100, lestart=None, leend=None, leuser=None,
- letitle=None):
- """Yield ImagePages from most recent uploads"""
- if isinstance(letitle, basestring):
- letitle = pywikibot.Page(pywikibot.Link(letitle))
- return self.logevents(logtype="upload", total=number, start=lestart,
- end=leend, user=leuser, page=letitle)
def getFilesFromAnHash(self, hash_found=None):
"""Return all images that have the same hash.
@@ -3133,7 +3133,8 @@
if not os.path.isfile(source_filename):
raise ValueError("File '%s' does not exist."
% source_filename)
- filesize = os.path.getsize(source_filename)
+ #filesize =
+ os.path.getsize(source_filename)
# TODO: if file size exceeds some threshold (to be determined),
# upload by chunks
req = api.Request(site=self, action="upload", token=token,
@@ -3157,7 +3158,7 @@
result = req.submit()
except api.APIError, err:
# TODO: catch and process foreseeable errors
- raise
+ raise err
result = result["upload"]
pywikibot.debug(result, _logger)
if "warnings" in result:
@@ -3201,7 +3202,8 @@
# N.B. API still provides no way to access Special:Newpages content
# directly, so we get new pages indirectly through 'recentchanges'
- namespaces = namespaces if namespaces is not None else namespace
+ namespaces = namespaces # if namespaces is not None else namespace
+
gen = self.recentchanges(
start=start, end=end, reverse=reverse,
namespaces=namespaces, changetype="new", user=user,
@@ -3217,12 +3219,23 @@
yield (newpage, pageitem['timestamp'], pageitem['newlen'],
u'', pageitem['user'], pageitem['comment'])
+
+ # doubles
+ # @deprecated('Site().logevents(logtype="upload",...)')
+ # @deprecate_arg("repeat", None)
+ # def newimages(self, number=100, lestart=None, leend=None, leuser=None,
+ # letitle=None):
+ # """Yield ImagePages from most recent uploads"""
+ # if isinstance(letitle, basestring):
+ # letitle = pywikibot.Page(pywikibot.Link(letitle))
+ # return self.logevents(logtype="upload", total=number, start=lestart,
+ # end=leend, user=leuser, page=letitle)
+
@deprecate_arg("number", None)
@deprecate_arg("repeat", None)
def newimages(self, user=None, start=None, end=None, reverse=False,
step=None, total=None):
"""Yield information about newly uploaded images.
-
Yields a tuple of ImagePage, Timestamp, user(unicode),
comment(unicode).
N.B. the API does not provide direct access to Special:Newimages, so
@@ -3230,7 +3243,7 @@
"""
#TODO: update docstring
- for event in logevents(self, logtype="upload", user=user,
+ for event in self.logevents(self, logtype="upload", user=user,
start=start, end=end, reverse=reverse,
step=step, total=total):
image = pywikibot.ImagePage(self, event['title'])
@@ -3790,8 +3803,6 @@
def linksearch(self, *args, **kwargs):
raise NotImplementedError
- def newimages(self, *args, **kwargs):
- raise NotImplementedError
#### METHODS NOT IMPLEMENTED YET ####
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index c30b678..daaf35c 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -13,6 +13,7 @@
#
__version__ = '$Id$'
+from pywikibot.exceptions import Error
try:
import mwparserfromhell
except ImportError:
@@ -595,7 +596,7 @@
link = unicode(links[site]).replace('[[:', '[[')
s.append(link)
except AttributeError:
- s.append(getSite(site).linkto(links[site], othersite=insite))
+ s.append(pywikibot.getSite(site).linkto(links[site],
othersite=insite))
if insite.lang in insite.family.interwiki_on_one_line:
sep = u' '
else:
@@ -634,7 +635,7 @@
#---------------------------------------
def getCategoryLinks(text, site=None):
- import catlib
+ #import catlib
"""Return a list of category links found in text.
List contains Category objects.
diff --git a/pywikibot/throttle.py b/pywikibot/throttle.py
index 240b606..51e1668 100644
--- a/pywikibot/throttle.py
+++ b/pywikibot/throttle.py
@@ -12,7 +12,7 @@
import pywikibot
from pywikibot import config
-import logging
+#import logging
import math
import threading
import time
@@ -140,7 +140,7 @@
"""Set the nominal delays in seconds. Defaults to config values."""
self.lock.acquire()
try:
- maxdelay = self.maxdelay
+ #maxdelay = self.maxdelay
if delay is None:
delay = self.mindelay
if writedelay is None:
diff --git a/pywikibot/titletranslate.py b/pywikibot/titletranslate.py
index 24ed10f..7454052 100644
--- a/pywikibot/titletranslate.py
+++ b/pywikibot/titletranslate.py
@@ -31,8 +31,8 @@
site = page.site
if family is None and site:
family = site.family
- if site:
- sitelang = site.language()
+ #if site:
+ #sitelang = site.language()
if hints:
for h in hints:
if ':' not in h:
diff --git a/pywikibot/userlib.py b/pywikibot/userlib.py
index 7844650..276a84d 100644
--- a/pywikibot/userlib.py
+++ b/pywikibot/userlib.py
@@ -14,4 +14,4 @@
__version__ = '$Id$'
-from pywikibot import User
+#from pywikibot import User
diff --git a/pywikibot/version.py b/pywikibot/version.py
index 9555d71..ffa3948 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -139,8 +139,10 @@
return (tag, rev, date, hsh)
+from generate_user_files.py import get_base_dir
+
def getversion_nightly():
- data = open(os.path.join(wikipediatools.get_base_dir(), 'version'))
+ data = open(os.path.join(get_base_dir(), 'version'))
tag = data.readline().strip()
date = time.strptime(data.readline()[:19], '%Y-%m-%dT%H:%M:%S')
rev = data.readline().strip()
diff --git a/pywikibot/xmlreader.py b/pywikibot/xmlreader.py
index c389266..c6a76e2 100644
--- a/pywikibot/xmlreader.py
+++ b/pywikibot/xmlreader.py
@@ -16,10 +16,11 @@
#
import threading
-import codecs
+#import codecs
import re
from xml.etree.cElementTree import iterparse
-import pywikibot
+import xml.sax
+#import pywikibot
def parseRestrictions(restrictions):
diff --git a/scripts/basic.py b/scripts/basic.py
index 1d8bfab..280d9c9 100755
--- a/scripts/basic.py
+++ b/scripts/basic.py
@@ -49,6 +49,7 @@
what would have been changed.
@type dry: boolean.
"""
+ site = pywikibot.getSite()
self.generator = generator
self.dry = dry
# Set the edit summary message
diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py
index affd2b7..3bd8f05 100755
--- a/scripts/blockpageschecker.py
+++ b/scripts/blockpageschecker.py
@@ -64,6 +64,7 @@
__version__ = '$Id$'
#
+import time
import re
import webbrowser
import pywikibot
@@ -199,7 +200,8 @@
elif quest == 'g':
from pywikibot import editor as editarticle
editor = editarticle.TextEditor()
- text = editor.edit(page.get())
+ #text =
+ editor.edit(page.get())
def main():
diff --git a/scripts/category.py b/scripts/category.py
index 73929cc..b9eda6a 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -383,7 +383,7 @@
editSummary='', inPlace=False, moveCatPage=True,
deleteEmptySourceCat=True, titleRegex=None,
useSummaryForDeletion=True):
- site = pywikibot.getSite()
+ #site = pywikibot.getSite()
self.editSummary = editSummary
self.oldCat = catlib.Category(pywikibot.Link('Category:' +
oldCatTitle))
self.newCatTitle = newCatTitle
@@ -727,7 +727,7 @@
articles = set(cat.articles())
if len(articles) == 0:
- pywikibot.output(u'There are no articles in category ' + catTitle)
+ pywikibot.output(u'There are no articles in category ' +
self.catTitle)
else:
preloadingGen = pagegenerators.PreloadingGenerator(iter(articles))
for article in preloadingGen:
@@ -822,6 +822,7 @@
pywikibot.output(tree, toStdout=True)
+catDB=None
def main(*args):
global catDB
@@ -850,7 +851,7 @@
catDB = CategoryDatabase()
action = None
sort_by_last_name = False
- restore = False
+ #restore = False
create_pages = False
for arg in pywikibot.handleArgs(*args):
if arg == 'add':
@@ -960,10 +961,12 @@
if __name__ == "__main__":
+
try:
main()
except pywikibot.Error:
pywikibot.error("Fatal error:", exc_info=True)
finally:
+ #global catDB
catDB.dump()
pywikibot.stopme()
diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py
index 17053ff..706d503 100755
--- a/scripts/category_redirect.py
+++ b/scripts/category_redirect.py
@@ -23,10 +23,10 @@
#
import cPickle
-import math
+#import math
import re
-import sys
-import traceback
+#import sys
+#import traceback
import time
from datetime import datetime, timedelta
import pywikibot
@@ -187,7 +187,7 @@
def readyToEdit(self, cat):
"""Return True if cat not edited during cooldown period, else False."""
- dateformat = "%Y-%m-%dT%H:%M:%SZ"
+ #dateformat = "%Y-%m-%dT%H:%M:%SZ"
today = datetime.now()
deadline = today + timedelta(days=-self.cooldown)
if cat.editTime() is None:
diff --git a/scripts/cosmetic_changes.py b/scripts/cosmetic_changes.py
index 5acb8ee..eff1469 100755
--- a/scripts/cosmetic_changes.py
+++ b/scripts/cosmetic_changes.py
@@ -72,7 +72,7 @@
#
__version__ = '$Id$'
#
-import sys
+#import sys
import re
import pywikibot
import isbn
@@ -536,7 +536,7 @@
return text
def removeUselessSpaces(self, text):
- result = []
+ #result = []
multipleSpacesR = re.compile(' +')
spaceAtLineEndR = re.compile(' $')
diff --git a/scripts/data_ingestion.py b/scripts/data_ingestion.py
index 386ff91..c68872a 100755
--- a/scripts/data_ingestion.py
+++ b/scripts/data_ingestion.py
@@ -87,6 +87,7 @@
for line in reader:
yield Photo(line[urlcolumn], line)
+import upload
class DataIngestionBot:
def __init__(self, reader, titlefmt, pagefmt,
site=pywikibot.getSite(u'commons', u'commons')):
diff --git a/scripts/delete.py b/scripts/delete.py
index 0a8e8b0..b154368 100644
--- a/scripts/delete.py
+++ b/scripts/delete.py
@@ -30,7 +30,7 @@
# Distributed under the terms of the MIT license.
#
import pywikibot
-from pywikibot import i18n, config, catlib, pagegenerators
+from pywikibot import i18n, pagegenerators # catlib config,
class DeletionRobot:
@@ -61,19 +61,19 @@
def main():
genFactory = pagegenerators.GeneratorFactory()
pageName = ''
- singlePage = ''
+ #singlePage = ''
summary = ''
always = False
- doSinglePage = False
- doCategory = False
- deleteSubcategories = True
- doRef = False
- doLinks = False
+ #doSinglePage = False
+ #doCategory = False
+ #deleteSubcategories = True
+ #doRef = False
+ #doLinks = False
doImages = False
undelete = False
- fileName = ''
+ #fileName = ''
generator = None
-
+ mysite = pywikibot.getSite()
# read command line parameters
for arg in pywikibot.handleArgs():
if arg == '-always':
@@ -83,8 +83,9 @@
summary = pywikibot.input(u'Enter a reason for the deletion:')
else:
summary = arg[len('-summary:'):]
- elif arg.startswith('-nosubcats'):
- deleteSubcategories = False
+ # elif arg.startswith('-nosubcats'):
+ # #deleteSubcategories = False
+ # pass
elif arg.startswith('-images'):
doImages = True
if len(arg) == len('-images'):
@@ -105,7 +106,7 @@
summary = i18n.twtranslate(mysite, 'delete-referring-pages',
{'page': pageName})
elif arg.startswith('-file'):
summary = i18n.twtranslate(mysite, 'delete-from-file')
- mysite = pywikibot.getSite()
+
if doImages:
if not summary:
summary = i18n.twtranslate(mysite, 'delete-images',
diff --git a/scripts/editarticle.py b/scripts/editarticle.py
index babf185..22454c0 100755
--- a/scripts/editarticle.py
+++ b/scripts/editarticle.py
@@ -70,7 +70,7 @@
if not self.options.edit_redirect and self.page.isRedirectPage():
self.page = self.page.getRedirectTarget()
- def handle_edit_conflict(self):
+ def handle_edit_conflict(self,new):
fn = os.path.join(tempfile.gettempdir(), self.page.title())
fp = open(fn, 'w')
fp.write(new)
diff --git a/scripts/featured.py b/scripts/featured.py
index f2b692e..f4887eb 100644
--- a/scripts/featured.py
+++ b/scripts/featured.py
@@ -64,14 +64,14 @@
# Distributed under the terms of the MIT license.
#
-import os.path
+#import os.path
import pickle
import re
-import sys
+#import sys
from copy import copy
import pywikibot
from pywikibot import i18n
-from pywikibot import config
+#from pywikibot import config
from pywikibot.pagegenerators import PreloadingGenerator
@@ -210,6 +210,8 @@
'zh': (CAT, u"已撤销的特色条目"),
}
+
+interactive = False
class FeaturedBot(pywikibot.Bot):
# Bot configuration.
@@ -360,7 +362,8 @@
self.featuredWithInterwiki(fromsite, process)
def featuredArticles(self, site, task, cache):
- wikidata = False
+ #wikidata = False
+
code = site.lang
articles = []
if task == 'good':
@@ -520,14 +523,18 @@
def featuredWithInterwiki(self, fromsite, task):
"""Place or remove the Link_GA/FA template on/from a page"""
+ global interactive
+
def compile_link(site, templates):
+
+
"""compile one link template list"""
findtemplate = '(%s)' % '|'.join(templates)
return re.compile(ur"\{\{%s\|%s\}\}"
% (findtemplate.replace(u' ', u'[ _]'),
site.code), re.IGNORECASE)
- quiet = self.getOption('quiet')
+ #quiet = self.getOption('quiet')
tosite = self.site
if not fromsite.lang in self.cache:
self.cache[fromsite.lang] = {}
@@ -542,7 +549,7 @@
re_Link_remove = compile_link(fromsite, remove_tl)
gen = self.featuredArticles(fromsite, task, cc)
gen = PreloadingGenerator(gen)
- pairs = []
+ #pairs = []
for a in gen:
if a.isRedirectPage():
a = a.getRedirectTarget()
@@ -603,16 +610,16 @@
except pywikibot.LockedPage:
pywikibot.output(u'Page %s is locked!'
% atrans.title())
- except pywikibot.PageNotSaved, e:
+ except pywikibot.PageNotSaved:
pywikibot.output(u"Page not saved")
-
+afterpage=None
def main(*args):
global interactive, afterpage
interactive = 0
afterpage = u"!"
- featuredcount = False
+ #featuredcount = False
fromlang = []
processType = 'featured'
part = False
--
To view, visit https://gerrit.wikimedia.org/r/94477
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabe1bb6d64fd75e22ef029b3eae1d8875ff59a6b
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mdupont <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
