Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

1 participants
13313 discussions

[Gerrit] pep8-ified scripts/script_wui.py - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ified scripts/script_wui.py ...................................................................... pep8-ified scripts/script_wui.py Change-Id: Id9cdb638d43d9a9eefd68099dfd3334aff940841 --- M scripts/script_wui.py 1 file changed, 39 insertions(+), 30 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/script_wui.py b/scripts/script_wui.py index 6744de4..9f60317 100755 --- a/scripts/script_wui.py +++ b/scripts/script_wui.py @@ -57,13 +57,19 @@ # ... # --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- # -__version__ = '$Id$' +__version__ = '$Id$' # -import datetime, time -import thread, threading -import sys, os, traceback, gc, resource +import datetime +import time +import thread +import threading +import sys +import os +import traceback +import gc +import resource import re # http://labix.org/lunatic-python @@ -78,25 +84,25 @@ import pywikibot.botirc -bot_config = { 'BotName': pywikibot.config.usernames[pywikibot.config.family][pywikibot.config.mylang], +bot_config = { + 'BotName': pywikibot.config.usernames[pywikibot.config.family][pywikibot.config.mylang], - # protected !!! ('CSS' or other semi-protected page is essential here) - 'ConfCSSshell': u'User:DrTrigon/DrTrigonBot/script_wui-shell.css', # u'User:DrTrigonBot/Simon sagt' ? - 'ConfCSScrontab': u'User:DrTrigon/DrTrigonBot/script_wui-crontab.css', + # protected !!! ('CSS' or other semi-protected page is essential here) + 'ConfCSSshell': u'User:DrTrigon/DrTrigonBot/script_wui-shell.css', # u'User:DrTrigonBot/Simon sagt' ? + 'ConfCSScrontab': u'User:DrTrigon/DrTrigonBot/script_wui-crontab.css', - # (may be protected but not that important... 'CSS' is not needed here !!!) - 'ConfCSSoutput': u'User:DrTrigonBot/Simulation', + # (may be protected but not that important... 'CSS' is not needed here !!!) + 'ConfCSSoutput': u'User:DrTrigonBot/Simulation', - 'CRONMaxDelay': 5*60.0, # check all ~5 minutes + 'CRONMaxDelay': 5 * 60.0, # check all ~5 minutes +# 'queue_security': ([u'DrTrigon', u'DrTrigonBot'], u'Bot: exec'), +# 'queue_security': ([u'DrTrigon'], u'Bot: exec'), -# 'queue_security': ([u'DrTrigon', u'DrTrigonBot'], u'Bot: exec'), -# 'queue_security': ([u'DrTrigon'], u'Bot: exec'), + # supported and allowed bot scripts + # (at the moment all) - # supported and allowed bot scripts - # (at the moment all) - - # forbidden parameters - # (at the moment none, but consider e.g. '-always' or allow it with '-simulate' only!) + # forbidden parameters + # (at the moment none, but consider e.g. '-always' or allow it with '-simulate' only!) } __simulate = True @@ -124,12 +130,12 @@ # init constants templ = pywikibot.Page(self.site, bot_config['ConfCSSshell']) - cron = pywikibot.Page(self.site, bot_config['ConfCSScrontab']) + cron = pywikibot.Page(self.site, bot_config['ConfCSScrontab']) self.templ = templ.title() - self.cron = cron.title() - self.refs = { self.templ: templ, - self.cron: cron, } + self.cron = cron.title() + self.refs = {self.templ: templ, + self.cron: cron, } pywikibot.output(u'** Pre-loading all relevant page contents') for item in self.refs: # security; first check if page is protected, reject any data if not @@ -176,9 +182,9 @@ # (date supported only, thus [min] and [hour] dropped) entry = crontab.CronTab(timestmp) # find the delay from current minute (does not return 0.0 - but next) - delay = entry.next(datetime.datetime.now().replace(second=0,microsecond=0)-datetime.timedelta(microseconds=1)) + delay = entry.next(datetime.datetime.now().replace(second=0, microsecond=0) - datetime.timedelta(microseconds=1)) #pywikibot.output(u'CRON delay for execution: %.3f (<= %i)' % (delay, bot_config['CRONMaxDelay'])) - + if (delay <= bot_config['CRONMaxDelay']): pywikibot.output(u"CRONTAB: %s / %s / %s" % (page, rev, timestmp)) self.do_check(page.title(), int(rev)) @@ -187,14 +193,15 @@ # Create two threads as follows # (simple 'thread' for more sophisticated code use 'threading') try: - thread.start_new_thread( main_script, (self.refs[page_title], rev, params) ) + thread.start_new_thread(main_script, (self.refs[page_title], rev, params)) except: # (done according to subster in trunk and submit in rewrite/.../data/api.py) # TODO: is this error handling here needed at all??!? - pywikibot.exception(tb=True) # secure traceback print (from api.py submit) + pywikibot.exception(tb=True) # secure traceback print (from api.py submit) pywikibot.warning(u"Unable to start thread") wiki_logger(traceback.format_exc(), self.refs[page_title], rev) + # Define a function for the thread def main_script(page, rev=None, params=None): @@ -225,10 +232,10 @@ else: code = page.getOldVersion(rev) # crontab; scheduled try: - exec( code ) + exec(code) except: # (done according to subster in trunk and submit in rewrite/.../data/api.py) - pywikibot.exception(tb=True) # secure traceback print (from api.py submit) + pywikibot.exception(tb=True) # secure traceback print (from api.py submit) sys.stdout = sys.__stdout__ sys.stderr = sys.__stderr__ @@ -245,19 +252,20 @@ pywikibot.config.simulate = __simulate sys.argv = __sys_argv - pywikibot.output(u'environment: garbage; %s / memory; %s / members; %s' % (gc.collect(), resource.getrusage(resource.RUSAGE_SELF).ru_maxrss*resource.getpagesize(), len(dir()))) + pywikibot.output(u'environment: garbage; %s / memory; %s / members; %s' % (gc.collect(), resource.getrusage(resource.RUSAGE_SELF).ru_maxrss * resource.getpagesize(), len(dir()))) # 'len(dir())' is equivalent to 'len(inspect.getmembers(__main__))' # append result to output page if rev is None: wiki_logger(buffer.getvalue(), page, rev) + def wiki_logger(buffer, page, rev=None): # (might be a problem here for TS and SGE, output string has another encoding) #buffer = buffer.decode(config.console_encoding) buffer = re.sub("\03\{(.*?)\}(.*?)\03\{default\}", "\g<2>", buffer) if rev is None: - rev = page.latestRevision() + rev = page.latestRevision() link = page.permalink(oldid=rev) # append to page outpage = pywikibot.Page(pywikibot.getSite(), bot_config['ConfCSSoutput']) @@ -265,6 +273,7 @@ outpage.put(text + u"\n== Simulation vom %s mit [%s code:%s] ==\n<pre>\n%s</pre>\n\n" % (pywikibot.Timestamp.now().isoformat(' '), link, rev, buffer)) # comment = pywikibot.translate(self.site.lang, bot_config['msg'])) + def main(): global __simulate, __sys_argv -- To view, visit https://gerrit.wikimedia.org/r/80858 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id9cdb638d43d9a9eefd68099dfd3334aff940841 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] pep8-ified userinterfaces - change (pywikibot/core)

by Xqt (Code Review)

Xqt has submitted this change and it was merged. Change subject: pep8-ified userinterfaces ...................................................................... pep8-ified userinterfaces Change-Id: If5dd6cad8eb9841dfc560842aa2c146849d96823 --- M pywikibot/userinterfaces/cgi_interface.py M pywikibot/userinterfaces/terminal_interface_base.py M pywikibot/userinterfaces/terminal_interface_unix.py M pywikibot/userinterfaces/terminal_interface_win32.py M pywikibot/userinterfaces/transliteration.py M pywikibot/userinterfaces/win32_unicode.py 6 files changed, 127 insertions(+), 122 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/userinterfaces/cgi_interface.py b/pywikibot/userinterfaces/cgi_interface.py index 7cf2fd3..21fd9ff 100644 --- a/pywikibot/userinterfaces/cgi_interface.py +++ b/pywikibot/userinterfaces/cgi_interface.py @@ -1,13 +1,14 @@ import sys + class UI: def __init__(self): pass - def output(self, text, colors = None, newline = True, toStdout = False): + def output(self, text, colors=None, newline=True, toStdout=False): if not toStdout: return sys.stdout.write(text.encode('UTF-8', 'replace')) - def input(self, question, colors = None): - self.output(question + ' ', newline = False, showcgi = True) + def input(self, question, colors=None): + self.output(question + ' ', newline=False, showcgi=True) diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py index 3c1caad..84f7102 100755 --- a/pywikibot/userinterfaces/terminal_interface_base.py +++ b/pywikibot/userinterfaces/terminal_interface_base.py @@ -7,7 +7,9 @@ __version__ = '$Id$' import transliteration -import traceback, re, sys +import traceback +import re +import sys import pywikibot as wikipedia from pywikibot import config from pywikibot.bot import DEBUG, VERBOSE, INFO, STDOUT, INPUT, WARNING @@ -40,15 +42,15 @@ class UI: def __init__(self): - self.stdin = sys.stdin + self.stdin = sys.stdin self.stdout = sys.stdout self.stderr = sys.stderr self.encoding = config.console_encoding self.transliteration_target = config.transliteration_target - + self.stderr = sys.stderr self.stdout = sys.stdout - + def init_handlers(self, root_logger, default_stream='stderr'): """Initialize the handlers for user output. @@ -94,7 +96,7 @@ def printNonColorized(self, text, targetStream): # We add *** after the text as a whole if anything needed to be colorized. lines = text.split('\n') - for i,line in enumerate(lines): + for i, line in enumerate(lines): if i > 0: line = "\n" + line line, count = colorTagR.subn('', line) @@ -103,19 +105,18 @@ targetStream.write(line.encode(self.encoding, 'replace')) printColorized = printNonColorized - + def _print(self, text, targetStream): if config.colorized_output: self.printColorized(text, targetStream) else: - self.printNonColorized(text, targetStream) + self.printNonColorized(text, targetStream) def output(self, text, toStdout=False, targetStream=None): """ If a character can't be displayed in the encoding used by the user's terminal, it will be replaced with a question mark or by a transliteration. - """ if config.transliterate: # Encode our unicode string in the encoding used by the user's @@ -139,10 +140,10 @@ if codecedText[i] == '?' and text[i] != u'?': try: transliterated = transliterator.transliterate( - text[i], default='?', prev=prev, next=text[i+1]) + text[i], default='?', prev=prev, next=text[i + 1]) except IndexError: transliterated = transliterator.transliterate( - text[i], default = '?', prev=prev, next=' ') + text[i], default='?', prev=prev, next=' ') # transliteration was successful. The replacement # could consist of multiple letters. # mark the transliterated letters in yellow. @@ -158,19 +159,19 @@ transliteratedText += codecedText[i] prev = codecedText[i] text = transliteratedText - + if not targetStream: if toStdout: targetStream = self.stdout else: targetStream = self.stderr - + self._print(text, targetStream) def _raw_input(self): return raw_input() - - def input(self, question, password = False): + + def input(self, question, password=False): """ Ask the user a question and return the answer. @@ -178,7 +179,6 @@ Unlike raw_input, this function automatically adds a space after the question. - """ # sound the terminal bell to notify the user @@ -198,7 +198,7 @@ """ Ask the user a question with a predefined list of acceptable answers. """ - options = options[:] # we don't want to edit the passed parameter + options = options[:] # we don't want to edit the passed parameter for i in range(len(options)): option = options[i] hotkey = hotkeys[i] @@ -211,7 +211,7 @@ if m: pos = m.start() options[i] = '%s[%s]%s' % (option[:pos], caseHotkey, - option[pos+1:]) + option[pos + 1:]) else: options[i] = '%s [%s]' % (option, caseHotkey) # loop until the user entered a valid choice @@ -220,7 +220,7 @@ answer = self.input(prompt) if answer.lower() in hotkeys or answer.upper() in hotkeys: return answer - elif default and answer=='': # empty string entered + elif default and answer == '': # empty string entered return default def editText(self, text, jumpIndex=None, highlight=None): @@ -262,6 +262,7 @@ return wikipedia.input( u'What is the solution of the CAPTCHA at this url ?') + class TerminalHandler(logging.Handler): """A handler class that writes logging records, appropriately formatted, to a stream connected to a terminal. This class does not close the stream, @@ -299,7 +300,7 @@ def emit(self, record): text = self.format(record) - return self.UI.output(text, targetStream = self.stream) + return self.UI.output(text, targetStream=self.stream) class TerminalFormatter(logging.Formatter): @@ -320,4 +321,4 @@ if self.level: return record.levelno <= self.level else: - return True \ No newline at end of file + return True diff --git a/pywikibot/userinterfaces/terminal_interface_unix.py b/pywikibot/userinterfaces/terminal_interface_unix.py index d2eb7cf..0ba718c 100755 --- a/pywikibot/userinterfaces/terminal_interface_unix.py +++ b/pywikibot/userinterfaces/terminal_interface_unix.py @@ -36,6 +36,7 @@ 'lightyellow': chr(27) + '[33;1m', # Light Yellow start tag } + class UnixUI(terminal_interface_base.UI): def printColorized(self, text, targetStream): lastColor = None diff --git a/pywikibot/userinterfaces/terminal_interface_win32.py b/pywikibot/userinterfaces/terminal_interface_win32.py index bfa8b5d..3507701 100755 --- a/pywikibot/userinterfaces/terminal_interface_win32.py +++ b/pywikibot/userinterfaces/terminal_interface_win32.py @@ -37,6 +37,7 @@ colorTagR = re.compile('\03{(?P<name>%s)}' % '|'.join(windowsColors.keys())) + # Compat for python <= 2.5 class Win32BaseUI(terminal_interface_base.UI): def __init__(self): diff --git a/pywikibot/userinterfaces/transliteration.py b/pywikibot/userinterfaces/transliteration.py index 723452c..0bb1f3b 100644 --- a/pywikibot/userinterfaces/transliteration.py +++ b/pywikibot/userinterfaces/transliteration.py @@ -255,47 +255,47 @@ self.trans[u"³"] = u"3" # Cyrillic - self.trans.update({u"А" : u"A", u"а" : u"a", u"Б" : u"B", u"б" : u"b", - u"В" : u"V", u"в" : u"v", u"Г" : u"G", u"г" : u"g", - u"Д" : u"D", u"д" : u"d", u"Е" : u"E", u"е" : u"e", - u"Ж" : u"Zh", u"ж" : u"zh", u"З" : u"Z", u"з" : u"z", - u"И" : u"I", u"и" : u"i", u"Й" : u"J", u"й" : u"j", - u"К" : u"K", u"к" : u"k", u"Л" : u"L", u"л" : u"l", - u"М" : u"M", u"м" : u"m", u"Н" : u"N", u"н" : u"n", - u"О" : u"O", u"о" : u"o", u"П" : u"P", u"п" : u"p", - u"Р" : u"R", u"р" : u"r", u"С" : u"S", u"с" : u"s", - u"Т" : u"T", u"т" : u"t", u"У" : u"U", u"у" : u"u", - u"Ф" : u"F", u"ф" : u"f", u"х" : u"kh", u"Ц" : u"C", - u"ц" : u"c", u"Ч" : u"Ch", u"ч" : u"ch", u"Ш" : u"Sh", - u"ш" : u"sh", u"Щ" : u"Shch", u"щ" : u"shch", u"Ь" : u"'", - u"ь" : "'", u"Ъ" : u'"', u"ъ" : '"', u"Ю" : u"Yu", - u"ю" : u"yu", u"Я" : u"Ya", u"я" : u"ya", u"Х" : u"Kh", - u"Χ" : u"Kh"}) + self.trans.update({u"А": u"A", u"а": u"a", u"Б": u"B", u"б": u"b", + u"В": u"V", u"в": u"v", u"Г": u"G", u"г": u"g", + u"Д": u"D", u"д": u"d", u"Е": u"E", u"е": u"e", + u"Ж": u"Zh", u"ж": u"zh", u"З": u"Z", u"з": u"z", + u"И": u"I", u"и": u"i", u"Й": u"J", u"й": u"j", + u"К": u"K", u"к": u"k", u"Л": u"L", u"л": u"l", + u"М": u"M", u"м": u"m", u"Н": u"N", u"н": u"n", + u"О": u"O", u"о": u"o", u"П": u"P", u"п": u"p", + u"Р": u"R", u"р": u"r", u"С": u"S", u"с": u"s", + u"Т": u"T", u"т": u"t", u"У": u"U", u"у": u"u", + u"Ф": u"F", u"ф": u"f", u"х": u"kh", u"Ц": u"C", + u"ц": u"c", u"Ч": u"Ch", u"ч": u"ch", u"Ш": u"Sh", + u"ш": u"sh", u"Щ": u"Shch", u"щ": u"shch", u"Ь": u"'", + u"ь": "'", u"Ъ": u'"', u"ъ": '"', u"Ю": u"Yu", + u"ю": u"yu", u"Я": u"Ya", u"я": u"ya", u"Х": u"Kh", + u"Χ": u"Kh"}) # Additional Cyrillic letters, most occuring in only one or a few languages - self.trans.update({u"Ы" : u"Y", u"ы" : u"y", u"Ё" : u"Ë", u"ё" : u"ë", - u"Э" : u"È", u"Ѐ" : u"È", u"э" : u"è", u"ѐ" : u"è", - u"І" : u"I", u"і" : u"i", u"Ї" : u"Ji", u"ї" : u"ji", - u"Є" : u"Je", u"є" : u"je", u"Ґ" : u"G", u"Ҝ" : u"G", - u"ґ" : u"g", u"ҝ" : u"g", u"Ђ" : u"Dj", u"ђ" : u"dj", - u"Ӣ" : u"Y", u"ӣ" : u"y", u"Љ" : u"Lj", u"љ" : u"lj", - u"Њ" : u"Nj", u"њ" : u"nj", u"Ћ" : u"Cj", u"ћ" : u"cj", - u"Җ" : u"Zhj", u"җ" : u"zhj", u"Ѓ" : u"Gj", u"ѓ" : u"gj", - u"Ќ" : u"Kj", u"ќ" : u"kj", u"Ӣ" : u"Ii", u"ӣ" : u"ii", - u"Ӯ" : u"U", u"ӯ" : u"u", u"Ҳ" : u"H", u"ҳ" : u"h", - u"Ҷ" : u"Dz",u"ҷ" : u"dz", u"Ө" :u"Ô", u"Ӫ" : u"Ô", - u"ө" : u"ô", u"ӫ" : u"ô", u"Ү": u"Y", u"ү": u"y", u"Һ": u"H", - u"һ": u"h", u"Ә": u"AE", u"Ӕ": u"AE", u"ә": u"ae", - u"Ӛ": u"Ë", u"Ӭ": u"Ë", u"ӛ": u"ë", u"ӭ": u"ë", u"Җ": u"Zhj", - u"җ": u"zhj", u"Ұ": u"U", u"ұ": u"u", u"ў": u"ù", u"Ў": u"Ù", - u"ѝ": u"ì", u"Ѝ": u"Ì", u"Ӑ": u"A", u"ă": u"a", u"Ӓ": u"Ä", - u"ҿ": u"ä", u"Ҽ" : u"Ts", u"Ҿ": u"Ts", u"ҽ": u"ts", u"ҿ": u"ts", - u"Ҙ": u"Dh", u"ҙ": u"dh", u"Ӏ": u"", u"ӏ": u"", u"Ӆ": u"L", - u"ӆ": u"l", u"Ӎ": u"M", u"ӎ": u"m", u"Ӧ": u"Ö", u"ӧ": u"ö", - u"Ҩ": u"u", u"ҩ": u"u", u"Ҧ": u"Ph", u"ҧ": u"ph", u"Ҏ": u"R", - u"ҏ": u"r", u"Ҫ": u"Th", u"ҫ": u"th", u"Ҭ": u"T", u"ҭ": u"t", - u"Ӯ": u"Û", u"ӯ": u"û", u"Ұ": u"U", u"Ӹ": u"U", u"ұ": u"u", - u"ӹ": u"u", u"Ҵ": u"Tts", u"ҵ": u"tts", u"Ӵ": u"Ch", u"ӵ": u"ch"}) + self.trans.update({u"Ы": u"Y", u"ы": u"y", u"Ё": u"Ë", u"ё": u"ë", + u"Э": u"È", u"Ѐ": u"È", u"э": u"è", u"ѐ": u"è", + u"І": u"I", u"і": u"i", u"Ї": u"Ji", u"ї": u"ji", + u"Є": u"Je", u"є": u"je", u"Ґ": u"G", u"Ҝ": u"G", + u"ґ": u"g", u"ҝ": u"g", u"Ђ": u"Dj", u"ђ": u"dj", + u"Ӣ": u"Y", u"ӣ": u"y", u"Љ": u"Lj", u"љ": u"lj", + u"Њ": u"Nj", u"њ": u"nj", u"Ћ": u"Cj", u"ћ": u"cj", + u"Җ": u"Zhj", u"җ": u"zhj", u"Ѓ": u"Gj", u"ѓ": u"gj", + u"Ќ": u"Kj", u"ќ": u"kj", u"Ӣ": u"Ii", u"ӣ": u"ii", + u"Ӯ": u"U", u"ӯ": u"u", u"Ҳ": u"H", u"ҳ": u"h", + u"Ҷ": u"Dz", u"ҷ": u"dz", u"Ө": u"Ô", u"Ӫ": u"Ô", + u"ө": u"ô", u"ӫ": u"ô", u"Ү": u"Y", u"ү": u"y", u"Һ": u"H", + u"һ": u"h", u"Ә": u"AE", u"Ӕ": u"AE", u"ә": u"ae", + u"Ӛ": u"Ë", u"Ӭ": u"Ë", u"ӛ": u"ë", u"ӭ": u"ë", u"Җ": u"Zhj", + u"җ": u"zhj", u"Ұ": u"U", u"ұ": u"u", u"ў": u"ù", u"Ў": u"Ù", + u"ѝ": u"ì", u"Ѝ": u"Ì", u"Ӑ": u"A", u"ă": u"a", u"Ӓ": u"Ä", + u"ҿ": u"ä", u"Ҽ": u"Ts", u"Ҿ": u"Ts", u"ҽ": u"ts", u"ҿ": u"ts", + u"Ҙ": u"Dh", u"ҙ": u"dh", u"Ӏ": u"", u"ӏ": u"", u"Ӆ": u"L", + u"ӆ": u"l", u"Ӎ": u"M", u"ӎ": u"m", u"Ӧ": u"Ö", u"ӧ": u"ö", + u"Ҩ": u"u", u"ҩ": u"u", u"Ҧ": u"Ph", u"ҧ": u"ph", u"Ҏ": u"R", + u"ҏ": u"r", u"Ҫ": u"Th", u"ҫ": u"th", u"Ҭ": u"T", u"ҭ": u"t", + u"Ӯ": u"Û", u"ӯ": u"û", u"Ұ": u"U", u"Ӹ": u"U", u"ұ": u"u", + u"ӹ": u"u", u"Ҵ": u"Tts", u"ҵ": u"tts", u"Ӵ": u"Ch", u"ӵ": u"ch"}) for char in u"ЈӤҊ": self.trans[char] = u"J" @@ -332,10 +332,10 @@ # Archaic Cyrillic letters self.trans.update({u"Ѹ": u"Ou", u"ѹ": u"ou", u"Ѡ": u"O", u"Ѻ": u"O", u"ѡ": u"o", - u"ѻ": u"o", u"Ѿ": u"Ot", u"ѿ": u"ot", u"Ѣ": u"E", u"ѣ": u"e", - u"Ѥ": u"Ei", u"Ѧ": u"Ei", u"ѥ": u"ei", u"ѧ": u"ei", u"Ѫ": u"Ai", - u"ѫ": u"ai", u"Ѯ": u"X", u"ѯ": u"x", u"Ѱ": u"Ps", u"ѱ": u"ps", - u"Ѳ": u"Th", u"ѳ": u"th", u"Ѵ": u"Ü", u"Ѷ": u"Ü", u"ѵ": u"ü"}) + u"ѻ": u"o", u"Ѿ": u"Ot", u"ѿ": u"ot", u"Ѣ": u"E", u"ѣ": u"e", + u"Ѥ": u"Ei", u"Ѧ": u"Ei", u"ѥ": u"ei", u"ѧ": u"ei", u"Ѫ": u"Ai", + u"ѫ": u"ai", u"Ѯ": u"X", u"ѯ": u"x", u"Ѱ": u"Ps", u"ѱ": u"ps", + u"Ѳ": u"Th", u"ѳ": u"th", u"Ѵ": u"Ü", u"Ѷ": u"Ü", u"ѵ": u"ü"}) # Hebrew alphabet for char in u"אע": @@ -443,7 +443,7 @@ self.trans[u"ؤ"] = u"w'" self.trans[u"ئ"] = u"y'" for char in u"◌◌": - self.trans[char] = u"" # indicates absence of vowels + self.trans[char] = u"" # indicates absence of vowels # Arabic vowels self.trans[u"◌"] = u"a" self.trans[u"◌"] = u"u" @@ -486,22 +486,22 @@ # Greek self.trans.update({u"Α": u"A", u"α": u"a", u"Β": u"B", u"β": u"b", u"Γ": u"G", - u"γ": u"g", u"Δ": u"D", u"δ": u"d", u"Ε": u"E", u"ε": u"e", - u"Ζ": u"Z", u"ζ": u"z", u"Η": u"I", u"η": u"i", u"θ": u"th", - u"Θ": u"Th", u"Ι": u"I", u"ι": u"i", u"Κ": u"K", u"κ": u"k", - u"Λ": u"L", u"λ": u"l", u"Μ": u"M", u"μ": u"m", u"Ν": u"N", - u"ν": u"n", u"Ξ": u"X", u"ξ": u"x", u"Ο": u"O", u"ο": u"o", - u"Π": u"P", u"π": u"p", u"Ρ": u"R", u"ρ": u"r", u"Σ": u"S", - u"σ": u"s", u"ς": u"s", u"Τ": u"T", u"τ": u"t", u"Υ": u"Y", - u"υ": u"y", u"Φ": u"F", u"φ": u"f", u"Ψ": u"Ps", u"ψ": u"ps", - u"Ω": u"O", u"ω": u"o", u"ϗ": u"&", u"Ϛ": u"St", u"ϛ": u"st", - u"Ϙ": u"Q", u"Ϟ": u"Q", u"ϙ": u"q", u"ϟ": u"q", u"Ϻ": u"S", - u"ϻ": u"s", u"Ϡ": u"Ss", u"ϡ": u"ss", u"Ϸ": u"Sh", u"ϸ": u"sh", - u"·": u":", u"Ά": u"Á", u"ά": u"á", u"Έ": u"É", u"Ή": u"É", - u"έ": u"é", u"ή": u"é", u"Ί": u"Í", u"ί": u"í", u"Ϊ": u"Ï", - u"ϊ": u"ï", u"ΐ": u"ï", u"Ό": u"Ó", u"ό": u"ó", u"Ύ": u"Ý", - u"ύ": u"ý", u"Ϋ": u"Y", u"ϋ": u"ÿ", u"ΰ": u"ÿ", u"Ώ": u"Ó", - u"ώ": u"ó"}) + u"γ": u"g", u"Δ": u"D", u"δ": u"d", u"Ε": u"E", u"ε": u"e", + u"Ζ": u"Z", u"ζ": u"z", u"Η": u"I", u"η": u"i", u"θ": u"th", + u"Θ": u"Th", u"Ι": u"I", u"ι": u"i", u"Κ": u"K", u"κ": u"k", + u"Λ": u"L", u"λ": u"l", u"Μ": u"M", u"μ": u"m", u"Ν": u"N", + u"ν": u"n", u"Ξ": u"X", u"ξ": u"x", u"Ο": u"O", u"ο": u"o", + u"Π": u"P", u"π": u"p", u"Ρ": u"R", u"ρ": u"r", u"Σ": u"S", + u"σ": u"s", u"ς": u"s", u"Τ": u"T", u"τ": u"t", u"Υ": u"Y", + u"υ": u"y", u"Φ": u"F", u"φ": u"f", u"Ψ": u"Ps", u"ψ": u"ps", + u"Ω": u"O", u"ω": u"o", u"ϗ": u"&", u"Ϛ": u"St", u"ϛ": u"st", + u"Ϙ": u"Q", u"Ϟ": u"Q", u"ϙ": u"q", u"ϟ": u"q", u"Ϻ": u"S", + u"ϻ": u"s", u"Ϡ": u"Ss", u"ϡ": u"ss", u"Ϸ": u"Sh", u"ϸ": u"sh", + u"·": u":", u"Ά": u"Á", u"ά": u"á", u"Έ": u"É", u"Ή": u"É", + u"έ": u"é", u"ή": u"é", u"Ί": u"Í", u"ί": u"í", u"Ϊ": u"Ï", + u"ϊ": u"ï", u"ΐ": u"ï", u"Ό": u"Ó", u"ό": u"ó", u"Ύ": u"Ý", + u"ύ": u"ý", u"Ϋ": u"Y", u"ϋ": u"ÿ", u"ΰ": u"ÿ", u"Ώ": u"Ó", + u"ώ": u"ó"}) # Japanese (katakana and hiragana) for char in u"アァあ": @@ -736,11 +736,11 @@ self.trans[char] = u"v" for char in u"ზ": self.trans[char] = u"z" - for char in u"თ":# + for char in u"თ": self.trans[char] = u"th" for char in u"ი": self.trans[char] = u"i" - for char in u"კ":# + for char in u"კ": self.trans[char] = u"k" for char in u"ლ": self.trans[char] = u"l" @@ -750,25 +750,25 @@ self.trans[char] = u"n" for char in u"ო": self.trans[char] = u"o" - for char in u"პ":# + for char in u"პ": self.trans[char] = u"p" - for char in u"ჟ":# + for char in u"ჟ": self.trans[char] = u"zh" for char in u"რ": self.trans[char] = u"r" for char in u"ს": self.trans[char] = u"s" - for char in u"ტ":# + for char in u"ტ": self.trans[char] = u"t" for char in u"უ": self.trans[char] = u"u" - for char in u"ფ":# + for char in u"ფ": self.trans[char] = u"ph" - for char in u"ქ":# + for char in u"ქ": self.trans[char] = u"q" - for char in u"ღ":# + for char in u"ღ": self.trans[char] = u"gh" - for char in u"ყ":# + for char in u"ყ": self.trans[char] = u"q'" for char in u"შ": self.trans[char] = u"sh" @@ -778,13 +778,13 @@ self.trans[char] = u"ts" for char in u"ძ": self.trans[char] = u"dz" - for char in u"წ":# + for char in u"წ": self.trans[char] = u"ts'" - for char in u"ჭ":# + for char in u"ჭ": self.trans[char] = u"ch'" for char in u"ხ": self.trans[char] = u"kh" - for char in u"ჯ":# + for char in u"ჯ": self.trans[char] = u"j" for char in u"ჰ": self.trans[char] = u"h" @@ -1659,12 +1659,13 @@ self.trans[u"໙"] = "9" for char in self.trans: value = self.trans[char] - if value == "?": continue + if value == "?": + continue while value.encode(encoding, 'replace').decode(encoding) == "?" and value in self.trans: assert value != self.trans[value], "%r == self.trans[%r]!" % (value, value) value = self.trans[value] self.trans[char] = value - + def transliterate(self, char, default="?", prev="-", next="-"): if char in self.trans: return self.trans[char] diff --git a/pywikibot/userinterfaces/win32_unicode.py b/pywikibot/userinterfaces/win32_unicode.py index ae00ef6..3646dc0 100755 --- a/pywikibot/userinterfaces/win32_unicode.py +++ b/pywikibot/userinterfaces/win32_unicode.py @@ -2,7 +2,7 @@ ############################################## # Support for unicode in windows cmd.exe # Posted on Stack Overflow [1], available under CC-BY-SA [2] -# +# # Question: "Windows cmd encoding change causes Python crash" [3] by Alex [4], # Answered [5] by David-Sarah Hopwood [6]. # @@ -27,8 +27,8 @@ argv = sys.argv if sys.platform == "win32": import codecs - from ctypes import WINFUNCTYPE, windll, POINTER, byref, c_int, \ - create_unicode_buffer + from ctypes import WINFUNCTYPE, windll, POINTER + from ctypes import byref, c_int, create_unicode_buffer from ctypes.wintypes import BOOL, HANDLE, DWORD, LPWSTR, LPCWSTR try: from ctypes.wintypes import LPVOID @@ -66,12 +66,11 @@ GetStdHandle = WINFUNCTYPE(HANDLE, DWORD)(("GetStdHandle", windll.kernel32)) STD_INPUT_HANDLE = DWORD(-10) STD_OUTPUT_HANDLE = DWORD(-11) - STD_ERROR_HANDLE = DWORD(-12) + STD_ERROR_HANDLE = DWORD(-12) GetFileType = WINFUNCTYPE(DWORD, DWORD)(("GetFileType", windll.kernel32)) - FILE_TYPE_CHAR = 0x0002 + FILE_TYPE_CHAR = 0x0002 FILE_TYPE_REMOTE = 0x8000 - GetConsoleMode = WINFUNCTYPE(BOOL, HANDLE, POINTER(DWORD)) \ - (("GetConsoleMode", windll.kernel32)) + GetConsoleMode = WINFUNCTYPE(BOOL, HANDLE, POINTER(DWORD))(("GetConsoleMode", windll.kernel32)) INVALID_HANDLE_VALUE = DWORD(-1).value def not_a_console(handle): @@ -80,21 +79,21 @@ return ((GetFileType(handle) & ~FILE_TYPE_REMOTE) != FILE_TYPE_CHAR or GetConsoleMode(handle, byref(DWORD())) == 0) - old_stdin_fileno = None + old_stdin_fileno = None old_stdout_fileno = None old_stderr_fileno = None if hasattr(sys.stdin, 'fileno'): - old_stdin_fileno = sys.stdin.fileno() + old_stdin_fileno = sys.stdin.fileno() if hasattr(sys.stdout, 'fileno'): old_stdout_fileno = sys.stdout.fileno() if hasattr(sys.stderr, 'fileno'): old_stderr_fileno = sys.stderr.fileno() - STDIN_FILENO = 0 + STDIN_FILENO = 0 STDOUT_FILENO = 1 STDERR_FILENO = 2 - real_stdin = (old_stdin_fileno == STDIN_FILENO) + real_stdin = (old_stdin_fileno == STDIN_FILENO) real_stdout = (old_stdout_fileno == STDOUT_FILENO) real_stderr = (old_stderr_fileno == STDERR_FILENO) @@ -102,7 +101,7 @@ hStdin = GetStdHandle(STD_INPUT_HANDLE) if not_a_console(hStdin): real_stdin = False - + if real_stdout: hStdout = GetStdHandle(STD_OUTPUT_HANDLE) if not_a_console(hStdout): @@ -116,7 +115,7 @@ if real_stdin: ReadConsoleW = WINFUNCTYPE(BOOL, HANDLE, LPVOID, DWORD, POINTER(DWORD), \ LPVOID)(("ReadConsoleW", windll.kernel32)) - + class UnicodeInput: def __init__(self, hConsole, name, bufsize=1024): self._hConsole = hConsole @@ -124,15 +123,14 @@ self.buffer = create_unicode_buffer(bufsize) self.name = name self.encoding = 'utf-8' - + def readline(self): - maxnum = DWORD(self.bufsize-1) + maxnum = DWORD(self.bufsize - 1) numrecv = DWORD(0) result = ReadConsoleW(self._hConsole, self.buffer, maxnum, byref(numrecv), None) if not result: raise Exception("stdin failure") return self.buffer.value[:numrecv.value].encode(self.encoding) - if real_stdout or real_stderr: # BOOL WINAPI WriteConsoleW(HANDLE hOutput, LPWSTR lpBuffer, DWORD nChars, @@ -155,11 +153,14 @@ def isatty(self): return False + def close(self): # don't really close the handle, that would only cause problems self.closed = True + def fileno(self): return self._fileno + def flush(self): if self._hConsole is None: try: @@ -191,7 +192,8 @@ raise IOError("WriteConsoleW returned %r, n.value = %r" % (retval, n.value)) remaining -= n.value - if remaining == 0: break + if remaining == 0: + break text = text[n.value:] except Exception, e: _complain("%s.write: %r" % (self.name, e)) @@ -206,31 +208,29 @@ raise if real_stdin: - stdin = UnicodeInput(hStdin, name='<Unicode console stdin>') + stdin = UnicodeInput(hStdin, name='<Unicode console stdin>') if real_stdout: stdout = UnicodeOutput(hStdout, None, STDOUT_FILENO, - '<Unicode console stdout>') + '<Unicode console stdout>') else: stdout = UnicodeOutput(None, sys.stdout, old_stdout_fileno, - '<Unicode redirected stdout>') + '<Unicode redirected stdout>') if real_stderr: stderr = UnicodeOutput(hStderr, None, STDERR_FILENO, - '<Unicode console stderr>') + '<Unicode console stderr>') else: stderr = UnicodeOutput(None, sys.stderr, old_stderr_fileno, - '<Unicode redirected stderr>') + '<Unicode redirected stderr>') except Exception, e: _complain("exception %r while fixing up sys.stdout and sys.stderr" % (e,)) - # While we're at it, let's unmangle the command-line arguments: # This works around <http://bugs.python.org/issue2128>. GetCommandLineW = WINFUNCTYPE(LPWSTR)(("GetCommandLineW", windll.kernel32)) - CommandLineToArgvW = WINFUNCTYPE(POINTER(LPWSTR), LPCWSTR, POINTER(c_int)) \ - (("CommandLineToArgvW", windll.shell32)) + CommandLineToArgvW = WINFUNCTYPE(POINTER(LPWSTR), LPCWSTR, POINTER(c_int))(("CommandLineToArgvW", windll.shell32)) argc = c_int(0) argv_unicode = CommandLineToArgvW(GetCommandLineW(), byref(argc)) -- To view, visit https://gerrit.wikimedia.org/r/80779 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If5dd6cad8eb9841dfc560842aa2c146849d96823 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] pep8-ified scripts/template.py - change (pywikibot/core)

by Xqt (Code Review)

Xqt has submitted this change and it was merged. Change subject: pep8-ified scripts/template.py ...................................................................... pep8-ified scripts/template.py Change-Id: I7dc726681d930aed5dfcdc256f12ed3417c0b869 --- M scripts/template.py 1 file changed, 18 insertions(+), 12 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/template.py b/scripts/template.py index f5d5d10..91ec9ff 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -104,13 +104,16 @@ # # Distributed under the terms of the MIT license. # -__version__='$Id$' +__version__ = '$Id$' # -import re, sys, string +import re +import sys +import string import pywikibot from pywikibot import i18n from pywikibot import config, pagegenerators, catlib from scripts import replace + def UserEditFilterGenerator(generator, username, timestamp=None, skip=False): """ @@ -129,7 +132,7 @@ found = False for ed in editors: uts = pywikibot.Timestamp.fromISOformat(ed['timestamp']) - if not timestamp or uts>=ts: + if not timestamp or uts >= ts: if username == ed['user']: found = True break @@ -178,7 +181,7 @@ templatePatterns.append(templatePattern) templateRegex = re.compile( r'\{\{ *([mM][sS][gG]:)?(?:%s) *(?P<parameters>\|[^}]+|) *}}' - % '|'.join(templatePatterns)) + % '|'.join(templatePatterns)) for entry in dump.parse(): if templateRegex.search(entry.text): page = pywikibot.Page(mysite, entry.title) @@ -191,8 +194,8 @@ remove all occurences of the old template, or substitute them with the template's text. """ - def __init__(self, generator, templates, subst = False, remove = False, - editSummary = '', acceptAll = False, addedCat = None): + def __init__(self, generator, templates, subst=False, remove=False, + editSummary='', acceptAll=False, addedCat=None): """ Arguments: * generator - A page generator. @@ -216,9 +219,9 @@ site, u'%s:%s' % (site.namespace(14), self.addedCat)) # get edit summary message if it's empty - if (self.editSummary==''): + if (self.editSummary == ''): Param = {'list': (', ').join(self.templates.keys()), - 'num' : len(self.templates)} + 'num': len(self.templates)} if self.remove: self.editSummary = i18n.twntranslate( site, 'template-removing', Param) @@ -260,11 +263,11 @@ if self.subst and self.remove: replacements.append((templateRegex, '{{subst:%s\g<parameters>}}' % new)) - exceptions['inside-tags']=['ref', 'gallery'] + exceptions['inside-tags'] = ['ref', 'gallery'] elif self.subst: replacements.append((templateRegex, '{{subst:%s\g<parameters>}}' % old)) - exceptions['inside-tags']=['ref', 'gallery'] + exceptions['inside-tags'] = ['ref', 'gallery'] elif self.remove: replacements.append((templateRegex, '')) else: @@ -276,6 +279,7 @@ addedCat=self.addedCat, editSummary=self.editSummary) replaceBot.run() + def main(*args): templateNames = [] @@ -349,8 +353,10 @@ gen = genFactory.getCombinedGenerator() if not gen: gens = [] - gens = [pagegenerators.ReferringPageGenerator( - t, onlyTemplateInclusion=True) for t in oldTemplates] + gens = [ + pagegenerators.ReferringPageGenerator(t, onlyTemplateInclusion=True) + for t in oldTemplates + ] gen = pagegenerators.CombinedPageGenerator(gens) gen = pagegenerators.DuplicateFilterPageGenerator(gen) -- To view, visit https://gerrit.wikimedia.org/r/80860 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7dc726681d930aed5dfcdc256f12ed3417c0b869 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] pep8-ified scripts/touch.py - change (pywikibot/core)

by Xqt (Code Review)

Xqt has submitted this change and it was merged. Change subject: pep8-ified scripts/touch.py ...................................................................... pep8-ified scripts/touch.py Change-Id: Ib1f35b181d3f221f9e3c43b1c244784efa9f1249 --- M scripts/touch.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/touch.py b/scripts/touch.py index f90ee15..84c2076 100755 --- a/scripts/touch.py +++ b/scripts/touch.py @@ -20,7 +20,7 @@ # # (C) Pywikipedia team # -__version__='$Id$' +__version__ = '$Id$' # # Distributed under the terms of the MIT license. # @@ -43,7 +43,7 @@ # get the page, and save it using the unmodified text. # whether or not getting a redirect throws an exception # depends on the variable self.touch_redirects. - text = page.get(get_redirect = self.touch_redirects) + text = page.get(get_redirect=self.touch_redirects) page.save("Pywikibot touch script") except pywikibot.NoPage: pywikibot.error(u"Page %s does not exist." -- To view, visit https://gerrit.wikimedia.org/r/80861 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib1f35b181d3f221f9e3c43b1c244784efa9f1249 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] pep8-ified scripts/upload.py - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ified scripts/upload.py ...................................................................... pep8-ified scripts/upload.py Change-Id: I941a05ee6a9a3914dc0623720792ff95abeede00 --- M scripts/upload.py 1 file changed, 11 insertions(+), 9 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/upload.py b/scripts/upload.py index 090cc0a..f21e6e1 100755 --- a/scripts/upload.py +++ b/scripts/upload.py @@ -24,10 +24,12 @@ # # Distributed under the terms of the MIT license. # -__version__='$Id$' +__version__ = '$Id$' # -import os, sys, time +import os +import sys +import time import urllib import urlparse import tempfile @@ -104,7 +106,7 @@ retrieved = False pywikibot.output( u"Connection closed at byte %s (%s left)" - % (rlen, content_len)) + % (rlen, content_len)) if accept_ranges and rlen > 0: resume = True pywikibot.output(u"Sleeping for %d seconds..." % dt) @@ -139,14 +141,14 @@ u"The filename on the target wiki will default to: %s" % filename) # FIXME: these 2 belong somewhere else, presumably in family - forbidden = '/' # to be extended + forbidden = '/' # to be extended allowed_formats = (u'gif', u'jpg', u'jpeg', u'mid', u'midi', u'ogg', u'png', u'svg', u'xcf', u'djvu', u'ogv', u'oga', u'tif', u'tiff') # ask until it's valid while True: newfn = pywikibot.input( - u'Enter a better name, or press enter to accept:') + u'Enter a better name, or press enter to accept:') if newfn == "": newfn = filename break @@ -160,8 +162,8 @@ if ext not in allowed_formats: choice = pywikibot.inputChoice( u"File format is not one of [%s], but %s. Continue?" - % (u' '.join(allowed_formats), ext), - ['yes', 'no'], ['y', 'N'], 'N') + % (u' '.join(allowed_formats), ext), + ['yes', 'no'], ['y', 'N'], 'N') if choice == 'n': continue break @@ -195,7 +197,7 @@ filename = self.process_filename() site = self.targetSite - imagepage = pywikibot.ImagePage(site, filename) # normalizes filename + imagepage = pywikibot.ImagePage(site, filename) # normalizes filename imagepage.text = self.description pywikibot.output(u'Uploading file to %s via API....' % site) @@ -231,7 +233,7 @@ else: #No warning, upload complete. pywikibot.output(u"Upload successful.") - return filename #data['filename'] + return filename # data['filename'] def run(self): while not self.urlOK(): -- To view, visit https://gerrit.wikimedia.org/r/80862 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I941a05ee6a9a3914dc0623720792ff95abeede00 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] Add description of U+FFFD to illegal title exception - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Add description of U+FFFD to illegal title exception ...................................................................... Add description of U+FFFD to illegal title exception Change-Id: If1b9f7fac92222712efd0cc8c320b2c9c2e946f2 --- M pywikibot/page.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 52e792a..fe7ed5f 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -2954,7 +2954,7 @@ # This code was adapted from Title.php : secureAndSplit() # if u'\ufffd' in t: - raise pywikibot.Error("Title contains illegal char (\\uFFFD)") + raise pywikibot.Error("Title contains illegal char (\\uFFFD 'REPLACEMENT CHARACTER')") # Replace underscores by spaces t = t.replace(u"_", u" ") -- To view, visit https://gerrit.wikimedia.org/r/80865 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1b9f7fac92222712efd0cc8c320b2c9c2e946f2 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] pep8-ified family files - change (pywikibot/core)

by Xqt (Code Review)

Xqt has submitted this change and it was merged. Change subject: pep8-ified family files ...................................................................... pep8-ified family files Change-Id: Ie30b3ddf73fc7cfc841789f6bac3cfc0af419d8d --- M pywikibot/families/anarchopedia_family.py M pywikibot/families/battlestarwiki_family.py M pywikibot/families/commons_family.py M pywikibot/families/fon_family.py M pywikibot/families/gentoo_family.py M pywikibot/families/i18n_family.py M pywikibot/families/incubator_family.py M pywikibot/families/lockwiki_family.py M pywikibot/families/lyricwiki_family.py M pywikibot/families/mediawiki_family.py M pywikibot/families/meta_family.py M pywikibot/families/oldwikivoyage_family.py M pywikibot/families/omegawiki_family.py M pywikibot/families/osm_family.py M pywikibot/families/southernapproach_family.py M pywikibot/families/species_family.py M pywikibot/families/strategy_family.py M pywikibot/families/test_family.py M pywikibot/families/vikidia_family.py M pywikibot/families/wikia_family.py M pywikibot/families/wikibooks_family.py M pywikibot/families/wikimedia_family.py M pywikibot/families/wikinews_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wikitech_family.py M pywikibot/families/wikiversity_family.py M pywikibot/families/wiktionary_family.py M pywikibot/families/wowwiki_family.py 30 files changed, 104 insertions(+), 103 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified Objections: Merlijn van Deen: There's a problem with this change, please improve diff --git a/pywikibot/families/anarchopedia_family.py b/pywikibot/families/anarchopedia_family.py index 664a221..037d015 100644 --- a/pywikibot/families/anarchopedia_family.py +++ b/pywikibot/families/anarchopedia_family.py @@ -3,8 +3,8 @@ from pywikibot import family -# The Anarchopedia family +# The Anarchopedia family class Family(family.Family): def __init__(self): family.Family.__init__(self) diff --git a/pywikibot/families/battlestarwiki_family.py b/pywikibot/families/battlestarwiki_family.py index cc41027..c77dc47 100644 --- a/pywikibot/families/battlestarwiki_family.py +++ b/pywikibot/families/battlestarwiki_family.py @@ -3,9 +3,9 @@ from pywikibot import family + # The Battlestar Wiki family, a set of Battlestar wikis. # http://battlestarwiki.org/ - class Family(family.Family): def __init__(self): family.Family.__init__(self) @@ -23,7 +23,7 @@ alphabetic = ['de', 'en', 'es', 'fr', 'tr', 'zh'] - def hostname(self,code): + def hostname(self, code): return '%s.battlestarwiki.org' % code def version(self, code): diff --git a/pywikibot/families/commons_family.py b/pywikibot/families/commons_family.py index e1ad8fa..7daedac 100644 --- a/pywikibot/families/commons_family.py +++ b/pywikibot/families/commons_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The Wikimedia Commons family +# The Wikimedia Commons family class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() diff --git a/pywikibot/families/fon_family.py b/pywikibot/families/fon_family.py index d4a9f78..5d776f2 100644 --- a/pywikibot/families/fon_family.py +++ b/pywikibot/families/fon_family.py @@ -3,6 +3,7 @@ from pywikibot import family + # The official Beta Wiki. class Family(family.Family): diff --git a/pywikibot/families/gentoo_family.py b/pywikibot/families/gentoo_family.py index c0907d4..1d8e63b 100644 --- a/pywikibot/families/gentoo_family.py +++ b/pywikibot/families/gentoo_family.py @@ -4,11 +4,11 @@ __version__ = '$Id$' + # An inofficial Gentoo wiki project. # Ask for permission at http://gentoo-wiki.com/Help:Bots before running a bot. # Be very careful, and set a long throttle: "until we see it is good one edit # ever minute and one page fetch every 30 seconds, maybe a *bit* faster later". - class Family(family.Family): def __init__(self): diff --git a/pywikibot/families/i18n_family.py b/pywikibot/families/i18n_family.py index ea0c30d..fc7a1af 100644 --- a/pywikibot/families/i18n_family.py +++ b/pywikibot/families/i18n_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The Wikimedia i18n family +# The Wikimedia i18n family class Family(family.Family): def __init__(self): diff --git a/pywikibot/families/incubator_family.py b/pywikibot/families/incubator_family.py index 1ac3876..2f38409 100644 --- a/pywikibot/families/incubator_family.py +++ b/pywikibot/families/incubator_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The Wikimedia Incubator family +# The Wikimedia Incubator family class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() diff --git a/pywikibot/families/lockwiki_family.py b/pywikibot/families/lockwiki_family.py index 4a91873..97d06e7 100644 --- a/pywikibot/families/lockwiki_family.py +++ b/pywikibot/families/lockwiki_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The locksmithwiki family +# The locksmithwiki family class Family(family.Family): def __init__(self): family.Family.__init__(self) diff --git a/pywikibot/families/lyricwiki_family.py b/pywikibot/families/lyricwiki_family.py index edbe647..5b25802 100644 --- a/pywikibot/families/lyricwiki_family.py +++ b/pywikibot/families/lyricwiki_family.py @@ -3,18 +3,18 @@ from pywikibot import family + # The LyricWiki family # user_config.py: # usernames['lyricwiki']['en'] = 'user' - class Family(family.Family): def __init__(self): family.Family.__init__(self) self.name = 'lyricwiki' self.langs = { 'en': 'lyrics.wikia.com', - } + } def version(self, code): return "1.16.2" diff --git a/pywikibot/families/mediawiki_family.py b/pywikibot/families/mediawiki_family.py index 99de8ef..7f3891c 100644 --- a/pywikibot/families/mediawiki_family.py +++ b/pywikibot/families/mediawiki_family.py @@ -4,9 +4,9 @@ from pywikibot import family + # The MediaWiki family # user-config.py: usernames['mediawiki']['mediawiki'] = 'User name' - class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() diff --git a/pywikibot/families/meta_family.py b/pywikibot/families/meta_family.py index 0812b13..7f3abc3 100644 --- a/pywikibot/families/meta_family.py +++ b/pywikibot/families/meta_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The meta wikimedia family +# The meta wikimedia family class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -14,7 +14,7 @@ 'meta': 'meta.wikimedia.org', } self.interwiki_forward = 'wikipedia' - self.cross_allowed = ['meta',] + self.cross_allowed = ['meta', ] def ssl_pathprefix(self, code): return "/wikipedia/meta" diff --git a/pywikibot/families/oldwikivoyage_family.py b/pywikibot/families/oldwikivoyage_family.py index df4cc11..9872d01 100644 --- a/pywikibot/families/oldwikivoyage_family.py +++ b/pywikibot/families/oldwikivoyage_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -#Family file for the original wikivoyage +#Family file for the original wikivoyage class Family(family.Family): def __init__(self): family.Family.__init__(self) diff --git a/pywikibot/families/omegawiki_family.py b/pywikibot/families/omegawiki_family.py index 024580a..4722987 100644 --- a/pywikibot/families/omegawiki_family.py +++ b/pywikibot/families/omegawiki_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# Omegawiki, the Ultimate online dictionary +# Omegawiki, the Ultimate online dictionary class Family(family.Family): def __init__(self): @@ -18,7 +18,7 @@ self.nocapitalize = self.langs.keys() - def hostname(self,code): + def hostname(self, code): return 'www.omegawiki.org' def version(self, code): diff --git a/pywikibot/families/osm_family.py b/pywikibot/families/osm_family.py index e1ec976..3a7ccbe 100644 --- a/pywikibot/families/osm_family.py +++ b/pywikibot/families/osm_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The project wiki of OpenStreetMap (OSM). +# The project wiki of OpenStreetMap (OSM). class Family(family.Family): def __init__(self): diff --git a/pywikibot/families/southernapproach_family.py b/pywikibot/families/southernapproach_family.py index 9dd36d5..33b218d 100644 --- a/pywikibot/families/southernapproach_family.py +++ b/pywikibot/families/southernapproach_family.py @@ -3,14 +3,14 @@ from pywikibot import family -# ZRHwiki, formerly known as SouthernApproachWiki, a wiki about Zürich Airport. +# ZRHwiki, formerly known as SouthernApproachWiki, a wiki about Zürich Airport. class Family(family.Family): def __init__(self): family.Family.__init__(self) self.name = 'southernapproach' self.langs = { - 'de':'www.zrhwiki.ch', + 'de': 'www.zrhwiki.ch', } def version(self, code): diff --git a/pywikibot/families/species_family.py b/pywikibot/families/species_family.py index 2fa41c8..1ff4c0a 100644 --- a/pywikibot/families/species_family.py +++ b/pywikibot/families/species_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The wikispecies family +# The wikispecies family class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() diff --git a/pywikibot/families/strategy_family.py b/pywikibot/families/strategy_family.py index 10e2005..276cc01 100644 --- a/pywikibot/families/strategy_family.py +++ b/pywikibot/families/strategy_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The Wikimedia Strategy family +# The Wikimedia Strategy family class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() diff --git a/pywikibot/families/test_family.py b/pywikibot/families/test_family.py index 6e71268..fb93ecc 100644 --- a/pywikibot/families/test_family.py +++ b/pywikibot/families/test_family.py @@ -4,6 +4,7 @@ from pywikibot import family + # The test wikipedia family class Family(family.WikimediaFamily): def __init__(self): diff --git a/pywikibot/families/vikidia_family.py b/pywikibot/families/vikidia_family.py index 019a212..9a8129d 100644 --- a/pywikibot/families/vikidia_family.py +++ b/pywikibot/families/vikidia_family.py @@ -3,6 +3,7 @@ from pywikibot import family + class Family(family.Family): def __init__(self): family.Family.__init__(self) diff --git a/pywikibot/families/wikia_family.py b/pywikibot/families/wikia_family.py index 75759eb..4830282 100644 --- a/pywikibot/families/wikia_family.py +++ b/pywikibot/families/wikia_family.py @@ -4,9 +4,9 @@ from pywikibot import family + # The Wikia Search family # user-config.py: usernames['wikia']['wikia'] = 'User name' - class Family(family.Family): def __init__(self): family.Family.__init__(self) diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 07e5cef..14435b9 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -# The Wikimedia family that is known as Wikibooks +# The Wikimedia family that is known as Wikibooks class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -46,53 +46,53 @@ } self.obsolete = { - 'aa': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Af… - 'ak': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ak… - 'als': None, # http://als.wikipedia.org/wiki/Wikipedia:Stammtisch/Archiv_2008-1#Afterwards… - 'as': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_As… + 'aa': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Af… + 'ak': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ak… + 'als': None, # http://als.wikipedia.org/wiki/Wikipedia:Stammtisch/Archiv_2008-1#Afterwards… + 'as': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_As… 'ast': None, - 'ay': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ay… - 'ba': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ba… - 'bi': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Bi… - 'bm': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ba… - 'bo': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ti… - 'ch': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ch… - 'co': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28644 + 'ay': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ay… + 'ba': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ba… + 'bi': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Bi… + 'bm': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ba… + 'bo': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ti… + 'ch': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ch… + 'co': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28644 'dk': 'da', - 'ga': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ga… - 'got': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Go… - 'gn': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Gu… - 'gu': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Gu… + 'ga': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ga… + 'got': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Go… + 'gn': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Gu… + 'gu': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Gu… 'jp': 'ja', - 'kn': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 - 'ks': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ka… - 'lb': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_L%… - 'ln': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Li… - 'lv': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_La… - 'mi': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ma… - 'minnan':'zh-min-nan', + 'kn': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 + 'ks': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ka… + 'lb': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_L%… + 'ln': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Li… + 'lv': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_La… + 'mi': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ma… + 'minnan': 'zh-min-nan', 'mn': None, 'my': None, - 'na': None, #http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Nauruan_Wikibooks - 'nah': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Na… + 'na': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Na… + 'nah': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Na… 'nb': 'no', - 'nds': None, #http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Plattd%C3%BC%C3%BCtsch_Wikibooks - 'ps': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Pa… - 'qu': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Qu… - 'rm': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ru… - 'se': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Sa… - 'simple' : 'en', # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 - 'su': None, #http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Basa_Sunda_Wikibooks_(2) - 'sw': None, #https://bugzilla.wikimedia.org/show_bug.cgi?id=25170 + 'nds': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Pl… + 'ps': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Pa… + 'qu': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Qu… + 'rm': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ru… + 'se': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Sa… + 'simple': 'en', # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 + 'su': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ba… + 'sw': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=25170 'tk': None, 'tokipona': None, - 'ug': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Uy… - 'vo': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=37413 - 'wa': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Wa… - 'xh': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Xh… - 'yo': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Yo… - 'za': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 + 'ug': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Uy… + 'vo': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=37413 + 'wa': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Wa… + 'xh': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Xh… + 'yo': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Yo… + 'za': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 'zh-tw': 'zh', 'zh-cn': 'zh', - 'zu': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=25425 + 'zu': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=25425 } diff --git a/pywikibot/families/wikimedia_family.py b/pywikibot/families/wikimedia_family.py index 35d7378..b1fb2c1 100644 --- a/pywikibot/families/wikimedia_family.py +++ b/pywikibot/families/wikimedia_family.py @@ -2,10 +2,10 @@ __version__ = '$Id$' -# The wikis of Chapters of the Wikimedia Foundation living at a xy.wikimedia.org url - from pywikibot import family + +# The wikis of Chapters of the Wikimedia Foundation living at a xy.wikimedia.org url class Family(family.Family): def __init__(self): family.Family.__init__(self) diff --git a/pywikibot/families/wikinews_family.py b/pywikibot/families/wikinews_family.py index dfa3f59..d24c408 100644 --- a/pywikibot/families/wikinews_family.py +++ b/pywikibot/families/wikinews_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -# The Wikimedia family that is known as Wikinews +# The Wikimedia family that is known as Wikinews class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -18,7 +18,6 @@ self.langs = dict([(lang, '%s.wikinews.org' % lang) for lang in self.languages_by_size]) - # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… self.cross_allowed = ['ca', 'cs', 'en', 'fa', 'ko', ] @@ -39,12 +38,12 @@ } self.obsolete = { - 'hu': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28342 + 'hu': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28342 'jp': 'ja', 'nb': 'no', - 'nl': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 + 'nl': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 'sd': None, - 'th': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28341 + 'th': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28341 'zh-tw': 'zh', 'zh-cn': 'zh' } diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 8dfcd23..10ac8a4 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -# The Wikimedia family that is known as Wikipedia, the Free Encyclopedia +# The Wikimedia family that is known as Wikipedia, the Free Encyclopedia class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -45,7 +45,6 @@ self.langs = dict([(lang, '%s.wikipedia.org' % lang) for lang in langs]) - self.category_redirect_templates = { '_default': (), diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 8fe6b3f..9ecf55b 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -# The Wikimedia family that is known as Wikiquote +# The Wikimedia family that is known as Wikiquote class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -22,7 +22,6 @@ self.langs = dict([(lang, '%s.wikiquote.org' % lang) for lang in self.languages_by_size]) - # attop is a list of languages that prefer to have the interwiki # links at the top of the page. @@ -66,32 +65,32 @@ } self.obsolete = { - 'als': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Al… - 'ang': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=29150 - 'ast': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28964 - 'bm': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ba… + 'als': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Al… + 'ang': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=29150 + 'ast': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=28964 + 'bm': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ba… 'co': None, - 'cr': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ne… + 'cr': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ne… 'dk': 'da', - 'ga': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ga… + 'ga': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ga… 'jp': 'ja', - 'kk': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 - 'kr': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ka… - 'ks': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ka… - 'kw': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ke… + 'kk': None, # https://bugzilla.wikimedia.org/show_bug.cgi?id=20325 + 'kr': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ka… + 'ks': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ka… + 'kw': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ke… 'lb': None, - 'minnan':'zh-min-nan', - 'na': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Na… + 'minnan': 'zh-min-nan', + 'na': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Na… 'nb': 'no', - 'nds': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Lo… - 'qu': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Qu… - 'simple': 'en', #http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Simple_English_(3)_Wikiquote - 'tk': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Tu… + 'nds': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Lo… + 'qu': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Qu… + 'simple': 'en', # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Si… + 'tk': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Tu… 'tokipona': None, - 'tt': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ta… - 'ug': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Oy… - 'vo': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Vo… - 'za':None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Zh… + 'tt': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ta… + 'ug': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Oy… + 'vo': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Vo… + 'za': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Zh… 'zh-tw': 'zh', 'zh-cn': 'zh' } diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 319541b..c33f6a2 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -# The Wikimedia family that is known as Wikisource +# The Wikimedia family that is known as Wikisource class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -45,11 +45,11 @@ } self.obsolete = { - 'ang': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ol… + 'ang': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ol… 'dk': 'da', - 'ht': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ha… + 'ht': None, # http://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ha… 'jp': 'ja', - 'minnan':'zh-min-nan', + 'minnan': 'zh-min-nan', 'nb': 'no', 'tokipona': None, 'zh-tw': 'zh', @@ -79,7 +79,7 @@ 'tr': [100], 'vi': [102], 'zh': [102], - } + } self.crossnamespace[0] = { '_default': self.authornamespaces, diff --git a/pywikibot/families/wikitech_family.py b/pywikibot/families/wikitech_family.py index 761e6cd..1c7f279 100644 --- a/pywikibot/families/wikitech_family.py +++ b/pywikibot/families/wikitech_family.py @@ -4,8 +4,8 @@ from pywikibot import family -# The Wikitech family +# The Wikitech family class Family(family.Family): def __init__(self): diff --git a/pywikibot/families/wikiversity_family.py b/pywikibot/families/wikiversity_family.py index 1fda56d..eb3c0dc 100644 --- a/pywikibot/families/wikiversity_family.py +++ b/pywikibot/families/wikiversity_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -# The Wikimedia family that is known as Wikiversity +# The Wikimedia family that is known as Wikiversity class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -19,4 +19,4 @@ for lang in self.languages_by_size]) # Global bot allowed languages on http://meta.wikimedia.org/wiki/Bot_policy/Implementation#Current_implementa… - self.cross_allowed = ['ja',] + self.cross_allowed = ['ja', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index 228437b..396ca18 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -3,8 +3,8 @@ __version__ = '$Id$' -# The Wikimedia family that is known as Wiktionary +# The Wikimedia family that is known as Wiktionary class Family(family.WikimediaFamily): def __init__(self): super(Family, self).__init__() @@ -71,7 +71,7 @@ 'ps', 'dv', 'ks', 'ne', 'pi', 'bh', 'mr', 'sa', 'hi', 'as', 'bn', 'pa', 'pnb', 'gu', 'or', 'ta', 'te', 'kn', 'ml', 'si', 'th', 'lo', 'dz', 'ka', 'ti', 'am', 'chr', 'iu', 'km', 'zh', 'ja', 'ko', - ] + ] self.interwiki_putfirst = { 'da': self.alphabetic, diff --git a/pywikibot/families/wowwiki_family.py b/pywikibot/families/wowwiki_family.py index 1ac120f..0ff4809 100644 --- a/pywikibot/families/wowwiki_family.py +++ b/pywikibot/families/wowwiki_family.py @@ -53,6 +53,7 @@ # Wikia's default CategorySelect extension always puts categories last self.categories_last = ['cs', 'da', 'de', 'el', 'en', 'es', 'fa', 'fi', 'fr', 'he', 'hr', 'hu', 'is', 'it', 'ja', 'ko', 'lt', 'lv', 'nl', 'no', 'pl', 'pt', 'pt-br', 'ro', 'ru', 'sk', 'sr', 'sv', 'tr', 'zh-tw', 'zh'] + def scriptpath(self, code): return '' -- To view, visit https://gerrit.wikimedia.org/r/80800 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie30b3ddf73fc7cfc841789f6bac3cfc0af419d8d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] Fix bug 1659: set correct language as source - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix bug 1659: set correct language as source ...................................................................... Fix bug 1659: set correct language as source Because the variable 'lang' was used for two different meanings, the saved language was whatever was read last from the json configuration. Change-Id: I2abd7311f6d534f71ffdbec44c80138966d70e1c --- M scripts/harvest_template.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py index c78b97a..05a9c52 100755 --- a/scripts/harvest_template.py +++ b/scripts/harvest_template.py @@ -55,8 +55,8 @@ page = pywikibot.Page(self.repo, 'Wikidata:List of wikis/python') source_values = json.loads(page.get()) source_values = source_values['wikipedia'] - for lang in source_values: - source_values[lang] = pywikibot.ItemPage(self.repo, source_values[lang]) + for source_lang in source_values: + source_values[source_lang] = pywikibot.ItemPage(self.repo, source_values[source_lang]) if lang in source_values: self.source = pywikibot.Claim(self.repo, 'p143') -- To view, visit https://gerrit.wikimedia.org/r/80976 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2abd7311f6d534f71ffdbec44c80138966d70e1c Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Matmarex <matma.rex(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] Start with a fresh list in html2unicode every time - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Start with a fresh list in html2unicode every time ...................................................................... Start with a fresh list in html2unicode every time def x(..., something=[]): something.extend([1,2,3]) means something becomes [1,2,3] on the first call, but [1,2,3,1,2,3] on the *second* call. This meant html2unicode got a longer list of replacements every time it is called. This commit changes it to the standard def x(..., something=None): if something is None: something = [] which means it's always an empty list, instead of what's left from the last call. Change-Id: Ifb5221135498633e6e38967fcf4b5a02b14fb4d5 Compat-Change-Id: Ie490b575a8a0cc4b5d45bbb97c0606e0fd64d4f9 --- M pywikibot/page.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 81daf92..db22a9a 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -3265,8 +3265,10 @@ # Utility functions for parsing page titles -def html2unicode(text, ignore = []): +def html2unicode(text, ignore = None): """Return text, replacing HTML entities by equivalent unicode characters.""" + if ignore is None: + ignore = [] # This regular expression will match any decimal and hexadecimal entity and # also entities that might be named entities. entityR = re.compile( -- To view, visit https://gerrit.wikimedia.org/r/79813 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifb5221135498633e6e38967fcf4b5a02b14fb4d5 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

[Gerrit] pwb.py: allow different config directory using -dir: - change (pywikibot/core)

by Xqt (Code Review)

Xqt has submitted this change and it was merged. Change subject: pwb.py: allow different config directory using -dir: ...................................................................... pwb.py: allow different config directory using -dir: Change-Id: I7643c189d06680c593d183c49d7324f8ab9f8e74 --- M pwb.py 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index ae732ed..6d58bbf 100644 --- a/pwb.py +++ b/pwb.py @@ -32,6 +32,13 @@ if "PYWIKIBOT2_DIR" not in os.environ: os.environ["PYWIKIBOT2_DIR"] = os.path.split(__file__)[0] +for i,x in enumerate(sys.argv): + if x.startswith("-dir:"): + os.environ["PYWIKIBOT2_DIR"] = x[5:] + sys.argv.pop(i) + break + + if not os.path.exists(os.path.join(os.environ["PYWIKIBOT2_DIR"], "user-config.py")): execfile('generate_user_files.py') -- To view, visit https://gerrit.wikimedia.org/r/79578 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7643c189d06680c593d183c49d7324f8ab9f8e74 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits