Pywikibot-commits August 2013

pywikibot-commits@lists.wikimedia.org

1 participants
172 discussions

[Gerrit] pep8 changes - change (pywikibot/core)
by jenkins-bot (Code Review) 23 Aug '13

23 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8 changes ...................................................................... pep8 changes Change-Id: I3aad0b30c05aa808f36ace84591440ce6c2ac35d --- M scripts/category.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category.py b/scripts/category.py index 22ef129..73929cc 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -639,7 +639,7 @@ contextLength = 500 if full_text.startswith(u'[['): # probably an image # Add extra paragraph. - contextLength = full_text.find('\n\n', contextLength+2) + contextLength = full_text.find('\n\n', contextLength + 2) if contextLength > 1000 or contextLength < 0: contextLength = 500 print -- To view, visit https://gerrit.wikimedia.org/r/80533 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3aad0b30c05aa808f36ace84591440ce6c2ac35d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Revert "Making SSL connection true as default per disabling ... - change (pywikibot/core)
by jenkins-bot (Code Review) 22 Aug '13

22 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: Revert "Making SSL connection true as default per disabling http for logged in users in 21 August" ...................................................................... Revert "Making SSL connection true as default per disabling http for logged in users in 21 August" This reverts commit 5edb7bcf35d8f5724a274832b3e5102ecb89d34c. The WMF is not switching for another week [1] and this change breaks editing on WMF sites due to a missing root certificate [2]. [1] http://article.gmane.org/gmane.science.linguistics.wikipedia.technical/72200 [2] https://sourceforge.net/p/pywikipediabot/bugs/1656/ Change-Id: I6c0c587ad38c07101d580a22043bbd607eb0b14d --- M pywikibot/family.py 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/family.py b/pywikibot/family.py index 88eb3d3..5796e4e 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -940,6 +940,3 @@ def shared_image_repository(self, code): return ('commons', 'commons') - - def protocol(self, code): - return 'https' -- To view, visit https://gerrit.wikimedia.org/r/80351 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c0c587ad38c07101d580a22043bbd607eb0b14d 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: jenkins-bot

1 0

[Gerrit] Revert "Making SSL connection true as default per disabling ... - change (pywikibot/compat)
by jenkins-bot (Code Review) 22 Aug '13

22 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: Revert "Making SSL connection true as default per disabling http for logged in users in 21 August" ...................................................................... Revert "Making SSL connection true as default per disabling http for logged in users in 21 August" This reverts commit 6addd6f70a386fd131acbe5c2d0b47f21a0cd68f. The WMF is not switching for another week [1] and this change breaks editing on WMF sites due to a missing root certificate [2]. [1] http://article.gmane.org/gmane.science.linguistics.wikipedia.technical/72200 [2] https://sourceforge.net/p/pywikipediabot/bugs/1656/ Change-Id: Ifab59ca6d9701b65ae779a28727b7b27c8193974 --- M family.py 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/family.py b/family.py index 255cc3d..871519d 100644 --- a/family.py +++ b/family.py @@ -4726,6 +4726,3 @@ def shared_image_repository(self, code): return ('commons', 'commons') - - def protocol(self, code): - return 'https' -- To view, visit https://gerrit.wikimedia.org/r/80350 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifab59ca6d9701b65ae779a28727b7b27c8193974 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] pep8-ify pywikibot/data/logentries.py - change (pywikibot/core)
by jenkins-bot (Code Review) 21 Aug '13

21 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ify pywikibot/data/logentries.py ...................................................................... pep8-ify pywikibot/data/logentries.py Change-Id: Ia6410f49041763e0f70f0e682a45d34c9e4d87be --- M pywikibot/data/logentries.py 1 file changed, 20 insertions(+), 17 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/data/logentries.py b/pywikibot/data/logentries.py index 589058e..81adb71 100644 --- a/pywikibot/data/logentries.py +++ b/pywikibot/data/logentries.py @@ -72,8 +72,7 @@ def timestamp(self): """Timestamp object corresponding to event timestamp""" if not hasattr(self, '_timestamp'): - self._timestamp = pywikibot.Timestamp.fromISOformat( - self.data['timestamp']) + self._timestamp = pywikibot.Timestamp.fromISOformat(self.data['timestamp']) return self._timestamp def comment(self): @@ -82,15 +81,16 @@ class BlockEntry(LogEntry): _expectedType = 'block' + def __init__(self, apidata): super(BlockEntry, self).__init__(apidata) - # see http://en.wikipedia.org/w/api.php?action=query&list=logevents&letype=block&… : + # see en.wikipedia.org/w/api.php?action=query&list=logevents&letype=block&lelimit… # When an autoblock is removed, the "title" field is not a page title # ( https://bugzilla.wikimedia.org/show_bug.cgi?id=17781 ) pos = self.data['title'].find('#') self.isAutoblockRemoval = pos > 0 if self.isAutoblockRemoval: - self._blockid = int(self.data['title'][pos+1:]) + self._blockid = int(self.data['title'][pos + 1:]) def title(self): """ @@ -148,19 +148,21 @@ """ if hasattr(self, '_expiry'): return self._expiry - self._expiry = pywikibot.Timestamp.fromISOformat( - self._getBlockDetails()['expiry']) + self._expiry = pywikibot.Timestamp.fromISOformat(self._getBlockDetails()['expiry']) return self._expiry class ProtectEntry(LogEntry): _expectedType = 'protect' + class RightsEntry(LogEntry): _expectedType = 'rights' + class DeleteEntry(LogEntry): _expectedType = 'delete' + class UploadEntry(LogEntry): _expectedType = 'upload' @@ -175,8 +177,7 @@ def new_title(self): """Page object of the new title""" if not hasattr(self, '_new_title'): - self._new_title = pywikibot.Page(pywikibot.Link( - self.data['move']['new_title'])) + self._new_title = pywikibot.Page(pywikibot.Link(self.data['move']['new_title'])) return self._new_title def suppressedredirect(self): @@ -191,8 +192,10 @@ class ImportEntry(LogEntry): _expectedType = 'import' + class PatrolEntry(LogEntry): _expectedType = 'patrol' + class NewUsersEntry(LogEntry): _expectedType = 'newusers' @@ -207,15 +210,15 @@ Only available method is create() """ _logtypes = { - 'block':BlockEntry, - 'protect':ProtectEntry, - 'rights':RightsEntry, - 'delete':DeleteEntry, - 'upload':UploadEntry, - 'move':MoveEntry, - 'import':ImportEntry, - 'patrol':PatrolEntry, - 'newusers':NewUsersEntry + 'block': BlockEntry, + 'protect': ProtectEntry, + 'rights': RightsEntry, + 'delete': DeleteEntry, + 'upload': UploadEntry, + 'move': MoveEntry, + 'import': ImportEntry, + 'patrol': PatrolEntry, + 'newusers': NewUsersEntry } def __init__(self, logtype=None): -- To view, visit https://gerrit.wikimedia.org/r/80293 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6410f49041763e0f70f0e682a45d34c9e4d87be Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] Ignore E502 'the backslash is redundant between brackets' - change (pywikibot/core)
by jenkins-bot (Code Review) 21 Aug '13

21 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: Ignore E502 'the backslash is redundant between brackets' ...................................................................... Ignore E502 'the backslash is redundant between brackets' Change-Id: I741e7ec56415a5fc2e55f5687d4fc5fa584d5c81 --- M .pep8 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/.pep8 b/.pep8 index fa2c71e..6e64087 100644 --- a/.pep8 +++ b/.pep8 @@ -1,4 +1,4 @@ [pep8] -ignore = E122,E241 +ignore = E122,E241,E502 exclude = distribute_setup.py,externals,user-config.py,./scripts/i18n/*,./pywikibot/date.py max_line_length = 256 -- To view, visit https://gerrit.wikimedia.org/r/79595 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I741e7ec56415a5fc2e55f5687d4fc5fa584d5c81 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] pep8-ified pywikibot/login.py - change (pywikibot/core)
by jenkins-bot (Code Review) 21 Aug '13

21 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ified pywikibot/login.py ...................................................................... pep8-ified pywikibot/login.py Change-Id: Ia974873801cd37906c097e2c4f3130fcdf1c496d --- M pywikibot/login.py 1 file changed, 20 insertions(+), 20 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/login.py b/pywikibot/login.py index a548197..e5b9f97 100644 --- a/pywikibot/login.py +++ b/pywikibot/login.py @@ -46,28 +46,26 @@ self.username = user elif sysop: try: - self.username = config.sysopnames\ - [self.site.family.name][self.site.code] + self.username = config.sysopnames[self.site.family.name][self.site.code] except KeyError: raise NoUsername( u"""ERROR: Sysop username for %(fam_name)s:%(wiki_code)s is undefined. If you have a sysop account for that site, please add a line to user-config.py: sysopnames['%(fam_name)s']['%(wiki_code)s'] = 'myUsername'""" - % {'fam_name': self.site.family.name, - 'wiki_code': self.site.code}) + % {'fam_name': self.site.family.name, + 'wiki_code': self.site.code}) else: try: - self.username = config.usernames\ - [self.site.family.name][self.site.code] + self.username = config.usernames[self.site.family.name][self.site.code] except: raise NoUsername( u"""ERROR: Username for %(fam_name)s:%(wiki_code)s is undefined. If you have an account for that site, please add a line to user-config.py: usernames['%(fam_name)s']['%(wiki_code)s'] = 'myUsername'""" - % {'fam_name': self.site.family.name, - 'wiki_code': self.site.code}) + % {'fam_name': self.site.family.name, + 'wiki_code': self.site.code}) self.password = password if getattr(config, 'password_file', ''): self.readPassword() @@ -95,7 +93,7 @@ # No bot policies on other sites return True - def getCookie(self, remember=True, captcha = None): + def getCookie(self, remember=True, captcha=None): """ Login to the site. @@ -141,25 +139,27 @@ """ password_f = open(config.password_file) for line in password_f: - if not line.strip(): continue + if not line.strip(): + continue entry = eval(line) - if len(entry) == 2: #for default userinfo - if entry[0] == self.username: self.password = entry[1] - elif len(entry) == 4: #for userinfo included code and family + if len(entry) == 2: # for default userinfo + if entry[0] == self.username: + self.password = entry[1] + elif len(entry) == 4: # for userinfo included code and family if entry[0] == self.site.code and \ - entry[1] == self.site.family.name and \ - entry[2] == self.username: + entry[1] == self.site.family.name and \ + entry[2] == self.username: self.password = entry[3] password_f.close() - def login(self, retry = False): + def login(self, retry=False): if not self.password: # As we don't want the password to appear on the screen, we set # password = True self.password = pywikibot.input( - u'Password for user %(name)s on %(site)s:' - % {'name': self.username, 'site': self.site}, - password = True) + u'Password for user %(name)s on %(site)s:' + % {'name': self.username, 'site': self.site}, + password=True) # self.password = self.password.encode(self.site.encoding()) @@ -171,7 +171,7 @@ pywikibot.error(u"Login failed (%s)." % e.code) if retry: self.password = None - return self.login(retry = True) + return self.login(retry=True) else: return False self.storecookiedata(cookiedata) -- To view, visit https://gerrit.wikimedia.org/r/79594 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia974873801cd37906c097e2c4f3130fcdf1c496d Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] pep8-ified pywikibot/interwiki_graph.py - change (pywikibot/core)
by jenkins-bot (Code Review) 21 Aug '13

21 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ified pywikibot/interwiki_graph.py ...................................................................... pep8-ified pywikibot/interwiki_graph.py Change-Id: I7c0143664d06c3040181df12360626ace65482e9 --- M pywikibot/interwiki_graph.py 1 file changed, 11 insertions(+), 7 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/interwiki_graph.py b/pywikibot/interwiki_graph.py index 21b39f7..5daf1a6 100644 --- a/pywikibot/interwiki_graph.py +++ b/pywikibot/interwiki_graph.py @@ -14,8 +14,10 @@ import pywikibot from pywikibot import config2 as config + class GraphImpossible(Exception): "Drawing a graph is not possible on your system." + class GraphSavingThread(threading.Thread): """ @@ -36,15 +38,16 @@ for format in config.interwiki_graph_formats: filename = 'interwiki-graphs/' + getFilename(self.originPage, format) - if self.graph.write(filename, prog = 'dot', format = format): + if self.graph.write(filename, prog='dot', format=format): pywikibot.output(u'Graph saved as %s' % filename) else: pywikibot.output(u'Graph could not be saved as %s' % filename) + class GraphDrawer: def __init__(self, subject): if not pydotfound: - raise GraphImpossible, 'pydot is not installed.' + raise GraphImpossible('pydot is not installed.') self.graph = None self.subject = subject @@ -53,7 +56,7 @@ page.title())).encode('utf-8') def addNode(self, page): - node = pydot.Node(self.getLabel(page), shape = 'rectangle') + node = pydot.Node(self.getLabel(page), shape='rectangle') node.set_URL("\"http://%s%s\"" % (page.site.hostname(), page.site.get_address(page.urlname()))) @@ -70,8 +73,8 @@ node.set_color('green') node.set_style('filled,bold') # if we found more than one valid page for this language: - if len(filter(lambda p: p.site == page.site and p.exists() \ - and not p.isRedirectPage(), + if len(filter(lambda p: p.site == page.site and p.exists() + and not p.isRedirectPage(), # noqa self.subject.foundIn.keys())) > 1: # mark conflict by octagonal node node.set_shape('octagon') @@ -133,14 +136,15 @@ self.addNode(page) # mark start node by pointing there from a black dot. firstLabel = self.getLabel(self.subject.originPage) - self.graph.add_node(pydot.Node('start', shape = 'point')) + self.graph.add_node(pydot.Node('start', shape='point')) self.graph.add_edge(pydot.Edge('start', firstLabel)) for page, referrers in self.subject.foundIn.iteritems(): for refPage in referrers: self.addDirectedEdge(page, refPage) self.saveGraphFile() -def getFilename(page, extension = None): + +def getFilename(page, extension=None): filename = '%s-%s-%s' % (page.site.family.name, page.site.language(), page.titleForFilename()) -- To view, visit https://gerrit.wikimedia.org/r/79593 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c0143664d06c3040181df12360626ace65482e9 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] pep8-ified pywikibot/i18n.py - change (pywikibot/core)
by jenkins-bot (Code Review) 21 Aug '13

21 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ified pywikibot/i18n.py ...................................................................... pep8-ified pywikibot/i18n.py Change-Id: Ieea20eefadd8d3933621bc31ca47585ad8bd396b --- M pywikibot/i18n.py 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index bc9f480..4a96bbe 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -25,7 +25,7 @@ @param code The language code @type code string @return a list of strings as language codes - + If no translation is available to a specified language, translate() will try each of the specified fallback languages, in order, until it finds one with a translation, with 'en' and '_default' as a last resort. @@ -502,7 +502,6 @@ default is os locale setting """ - code = config.userinterface_lang or \ - locale.getdefaultlocale()[0].split('_')[0] + code = config.userinterface_lang or locale.getdefaultlocale()[0].split('_')[0] trans = twtranslate(code, twtitle, parameters) return pywikibot.input(trans, password) -- To view, visit https://gerrit.wikimedia.org/r/79592 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieea20eefadd8d3933621bc31ca47585ad8bd396b Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

[Gerrit] pep8: pywikibot/fixes.py - change (pywikibot/core)
by jenkins-bot (Code Review) 21 Aug '13

21 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8: pywikibot/fixes.py ...................................................................... pep8: pywikibot/fixes.py Change-Id: Ibec26dc974cc3075bd7d71b35fc271e58851b15d --- M pywikibot/fixes.py 1 file changed, 110 insertions(+), 110 deletions(-) Approvals: Legoktm: Looks good to me, approved Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/fixes.py b/pywikibot/fixes.py index c22f572..9f7ee2c 100644 --- a/pywikibot/fixes.py +++ b/pywikibot/fixes.py @@ -43,27 +43,27 @@ 'HTML': { 'regex': True, 'msg': { - 'ar':u'روبوت: تحويل/تصليح HTML', - 'be':u'Бот: карэкцыя HTML', - 'cs':u'převod/oprava HTML', - 'en':u'Robot: Converting/fixing HTML', - 'eo':u'Bot: koredtado de HTMLa teksto', - 'fa':u'ربات:تبدیل/تصحیح کدهای اچ‌تی‌ام‌ال', - 'de':u'Bot: konvertiere/korrigiere HTML', - 'fr':u'Robot: convertit/fixe HTML', - 'he':u'בוט: ממיר/מתקן HTML', - 'ja':u'ロボットによる: HTML転換', - 'ksh':u'Bot: vun HTML en Wikikood wandelle', - 'ia':u'Robot: conversion/reparation de HTML', - 'lt':u'robotas: konvertuojamas/taisomas HTML', - 'nl':u'Bot: conversie/reparatie HTML', - 'pl':u'Robot konwertuje/naprawia HTML', - 'pt':u'Bot: Corrigindo HTML', - 'ru':u'Бот: коррекция HTML', - 'sr':u'Бот: Поправка HTML-а', - 'sv':u'Bot: Konverterar/korrigerar HTML', - 'uk':u'Бот: корекцiя HTML', - 'zh':u'機器人: 轉換HTML', + 'ar': u'روبوت: تحويل/تصليح HTML', + 'be': u'Бот: карэкцыя HTML', + 'cs': u'převod/oprava HTML', + 'en': u'Robot: Converting/fixing HTML', + 'eo': u'Bot: koredtado de HTMLa teksto', + 'fa': u'ربات:تبدیل/تصحیح کدهای اچ‌تی‌ام‌ال', + 'de': u'Bot: konvertiere/korrigiere HTML', + 'fr': u'Robot: convertit/fixe HTML', + 'he': u'בוט: ממיר/מתקן HTML', + 'ja': u'ロボットによる: HTML転換', + 'ksh': u'Bot: vun HTML en Wikikood wandelle', + 'ia': u'Robot: conversion/reparation de HTML', + 'lt': u'robotas: konvertuojamas/taisomas HTML', + 'nl': u'Bot: conversie/reparatie HTML', + 'pl': u'Robot konwertuje/naprawia HTML', + 'pt': u'Bot: Corrigindo HTML', + 'ru': u'Бот: коррекция HTML', + 'sr': u'Бот: Поправка HTML-а', + 'sv': u'Bot: Konverterar/korrigerar HTML', + 'uk': u'Бот: корекцiя HTML', + 'zh': u'機器人: 轉換HTML', }, 'replacements': [ # Everything case-insensitive (?i) @@ -108,7 +108,7 @@ 'grammar-de': { 'regex': True, 'msg': { - 'de':u'Bot: korrigiere Grammatik', + 'de': u'Bot: korrigiere Grammatik', }, 'replacements': [ #(u'([Ss]owohl) ([^,\.]+?), als auch', r'\1 \2 als auch'), @@ -150,26 +150,26 @@ r'20min.ch', # Schweizer News-Seite ], 'inside': [ - r'<code>.*</code>', # because of code examples + r'<code>.*</code>', # because of code examples r'{{[Zz]itat\|.*?}}', - ur'{{§\|.*?}}', # Gesetzesparagraph + ur'{{§\|.*?}}', # Gesetzesparagraph ur'§ ?\d+[a-z]', # Gesetzesparagraph - r'Ju 52/1m', # Flugzeugbezeichnung - r'Ju 52/3m', # Flugzeugbezeichnung - r'AH-1W', # Hubschrauberbezeichnung - r'ZPG-3W', # Luftschiffbezeichnung - r'8mm', # Filmtitel - r'802.11g', # WLAN-Standard - r'DOS/4GW', # Software - r'ntfs-3g', # Dateisystem-Treiber - r'/\w(,\w)*/', # Laut-Aufzählung in der Linguistik - r'[xyz](,[xyz])+', # Variablen in der Mathematik (unklar, ob Leerzeichen hier Pflicht sind) - r'(?m)^;(.*?)$', # Definitionslisten, dort gibt es oft absichtlich Leerzeichen vor Doppelpunkten - r'\d+h( | )\d+m', # Schreibweise für Zeiten, vor allem in Film-Infoboxen. Nicht korrekt, aber dafür schön kurz. - r'(?i)\[\[(Bild|Image|Media):.+?\|', # Dateinamen auslassen + r'Ju 52/1m', # Flugzeugbezeichnung + r'Ju 52/3m', # Flugzeugbezeichnung + r'AH-1W', # Hubschrauberbezeichnung + r'ZPG-3W', # Luftschiffbezeichnung + r'8mm', # Filmtitel + r'802.11g', # WLAN-Standard + r'DOS/4GW', # Software + r'ntfs-3g', # Dateisystem-Treiber + r'/\w(,\w)*/', # Laut-Aufzählung in der Linguistik + r'[xyz](,[xyz])+', # Variablen in der Mathematik (unklar, ob Leerzeichen hier Pflicht sind) + r'(?m)^;(.*?)$', # Definitionslisten, dort gibt es oft absichtlich Leerzeichen vor Doppelpunkten + r'\d+h( | )\d+m', # Schreibweise für Zeiten, vor allem in Film-Infoboxen. Nicht korrekt, aber dafür schön kurz. + r'(?i)\[\[(Bild|Image|Media):.+?\|', # Dateinamen auslassen r'{{bgc\|.*?}}', # Hintergrundfarbe r'\d+m', # bei chemischen Formeln - r'$[A-Z][A-Za-z]*(,[A-Z][A-Za-z]*(.*?|.*?|))+$' # chemische Formel, z. B. AuPb(Pb,Sb,Bi)Te. Hier sollen keine Leerzeichen hinter die Kommata. + r'$[A-Z][A-Za-z]*(,[A-Z][A-Za-z]*(.*?|.*?|))+$' # chemische Formel, z. B. AuPb(Pb,Sb,Bi)Te. Hier sollen keine Leerzeichen hinter die Kommata. ], 'title': [ r'Arsen', # chemische Formel @@ -184,25 +184,25 @@ 'syntax': { 'regex': True, 'msg': { - 'ar':u'بوت: تصليح تهيئة الويكي', - 'be':u'Бот: Карэкцыя вiкi-сiнтаксiсу', - 'cs':u'Oprava wikisyntaxe', - 'de':u'Bot: Korrigiere Wiki-Syntax', - 'en':u'Robot: Fixing wiki syntax', - 'eo':u'Bot: Korektado de vikia sintakso', - 'fa':u'ربات:تصحیح قالب ویکی‌نویسی', - 'fr':u'Bot: Corrige wiki-syntaxe', - 'he':u'בוט: מתקן תחביר ויקי', - 'ia':u'Robot: Reparation de syntaxe wiki', - 'ja':u'ロボットによる: wiki構文修正', - 'lt':u'robotas: Taisoma wiki sintaksė', - 'nl':u'Bot: reparatie wikisyntaxis', - 'pl':u'Robot poprawia wiki-składnię', - 'pt':u'Bot: Corrigindo sintaxe wiki', - 'ru':u'Бот: Коррекция вики синтаксиса', - 'sr':u'Бот: Поправка вики синтаксе', - 'uk':u'Бот: Корекцiя вiкi-синтаксису', - 'zh':u'機器人: 修正wiki語法', + 'ar': u'بوت: تصليح تهيئة الويكي', + 'be': u'Бот: Карэкцыя вiкi-сiнтаксiсу', + 'cs': u'Oprava wikisyntaxe', + 'de': u'Bot: Korrigiere Wiki-Syntax', + 'en': u'Robot: Fixing wiki syntax', + 'eo': u'Bot: Korektado de vikia sintakso', + 'fa': u'ربات:تصحیح قالب ویکی‌نویسی', + 'fr': u'Bot: Corrige wiki-syntaxe', + 'he': u'בוט: מתקן תחביר ויקי', + 'ia': u'Robot: Reparation de syntaxe wiki', + 'ja': u'ロボットによる: wiki構文修正', + 'lt': u'robotas: Taisoma wiki sintaksė', + 'nl': u'Bot: reparatie wikisyntaxis', + 'pl': u'Robot poprawia wiki-składnię', + 'pt': u'Bot: Corrigindo sintaxe wiki', + 'ru': u'Бот: Коррекция вики синтаксиса', + 'sr': u'Бот: Поправка вики синтаксе', + 'uk': u'Бот: Корекцiя вiкi-синтаксису', + 'zh': u'機器人: 修正wiki語法', }, 'replacements': [ # external link in double brackets @@ -243,14 +243,14 @@ 'startspace', # because of code examples ], 'text-contains': [ - r'http://.*?object=tx\|', # regular dash in URL - r'http://.*?allmusic\.com', # regular dash in URL - r'http://.*?allmovie\.com', # regular dash in URL - r'http://physics.nist.gov/', # regular dash in URL - r'http://www.forum-seniorenarbeit.de/', # regular dash in URL - r'http://kuenstlerdatenbank.ifa.de/', # regular dash in URL - r'&object=med', # regular dash in URL - r'\[CDATA\[' # lots of brackets + r'http://.*?object=tx\|', # regular dash in URL + r'http://.*?allmusic\.com', # regular dash in URL + r'http://.*?allmovie\.com', # regular dash in URL + r'http://physics.nist.gov/', # regular dash in URL + r'http://www.forum-seniorenarbeit.de/', # regular dash in URL + r'http://kuenstlerdatenbank.ifa.de/', # regular dash in URL + r'&object=med', # regular dash in URL + r'\[CDATA\[' # lots of brackets ], } }, @@ -260,25 +260,25 @@ 'syntax-safe': { 'regex': True, 'msg': { - 'ar':u'بوت: تصليح تهيئة الويكي', - 'be':u'Бот: Карэкцыя вiкi-сiнтаксiсу', - 'cs':u'Oprava wikisyntaxe', - 'de':u'Bot: Korrigiere Wiki-Syntax', - 'en':u'Robot: Fixing wiki syntax', - 'eo':u'Bot: Korektado de vikia sintakso', - 'fa':u'ربات:تصحیح قالب ویکی‌نویسی', - 'fr':u'Bot: Corrige wiki-syntaxe', - 'he':u'בוט: מתקן תחביר ויקי', - 'ia':u'Robot: Reparation de syntaxe wiki', - 'ja':u'ロボットによる: wiki構文修正', - 'lt':u'robotas: Taisoma wiki sintaksė', - 'nl':u'Bot: reparatie wikisyntaxis', - 'pl':u'Robot poprawia wiki-składnię', - 'pt':u'Bot: Corrigindo sintaxe wiki', - 'ru':u'Бот: Коррекция вики синтаксиса', - 'sr':u'Бот: Поправка вики синтаксе', - 'uk':u'Бот: Корекцiя вiкi-синтаксису', - 'zh':u'機器人: 修正wiki語法', + 'ar': u'بوت: تصليح تهيئة الويكي', + 'be': u'Бот: Карэкцыя вiкi-сiнтаксiсу', + 'cs': u'Oprava wikisyntaxe', + 'de': u'Bot: Korrigiere Wiki-Syntax', + 'en': u'Robot: Fixing wiki syntax', + 'eo': u'Bot: Korektado de vikia sintakso', + 'fa': u'ربات:تصحیح قالب ویکی‌نویسی', + 'fr': u'Bot: Corrige wiki-syntaxe', + 'he': u'בוט: מתקן תחביר ויקי', + 'ia': u'Robot: Reparation de syntaxe wiki', + 'ja': u'ロボットによる: wiki構文修正', + 'lt': u'robotas: Taisoma wiki sintaksė', + 'nl': u'Bot: reparatie wikisyntaxis', + 'pl': u'Robot poprawia wiki-składnię', + 'pt': u'Bot: Corrigindo sintaxe wiki', + 'ru': u'Бот: Коррекция вики синтаксиса', + 'sr': u'Бот: Поправка вики синтаксе', + 'uk': u'Бот: Корекцiя вiкi-синтаксису', + 'zh': u'機器人: 修正wiki語法', }, 'replacements': [ # external link in double brackets @@ -308,17 +308,17 @@ } }, - 'case-de': { # German upper / lower case issues + 'case-de': { # German upper / lower case issues 'regex': True, 'msg': { - 'de':u'Bot: Korrigiere Groß-/Kleinschreibung', + 'de': u'Bot: Korrigiere Groß-/Kleinschreibung', }, 'replacements': [ (r'\batlantische(r|n|) Ozean', r'Atlantische\1 Ozean'), (r'\bdeutsche(r|n|) Bundestag\b', r'Deutsche\1 Bundestag'), - (r'\bdeutschen Bundestags\b', r'Deutschen Bundestags'), # Aufpassen, z. B. 'deutsche Bundestagswahl' + (r'\bdeutschen Bundestags\b', r'Deutschen Bundestags'), # Aufpassen, z. B. 'deutsche Bundestagswahl' (r'\bdeutsche(r|n|) Reich\b', r'Deutsche\1 Reich'), - (r'\bdeutschen Reichs\b', r'Deutschen Reichs'), # Aufpassen, z. B. 'deutsche Reichsgrenzen' + (r'\bdeutschen Reichs\b', r'Deutschen Reichs'), # Aufpassen, z. B. 'deutsche Reichsgrenzen' (r'\bdritte(n|) Welt(?!krieg)', r'Dritte\1 Welt'), (r'\bdreißigjährige(r|n|) Krieg', r'Dreißigjährige\1 Krieg'), (r'\beuropäische(n|) Gemeinschaft', r'Europäische\1 Gemeinschaft'), @@ -347,7 +347,7 @@ 'vonbis': { 'regex': True, 'msg': { - 'de':u'Bot: Ersetze Binde-/Gedankenstrich durch "bis"', + 'de': u'Bot: Ersetze Binde-/Gedankenstrich durch "bis"', }, 'replacements': [ # Bindestrich, Gedankenstrich, Geviertstrich @@ -360,7 +360,7 @@ 'music': { 'regex': False, 'msg': { - 'de':u'Bot: korrigiere Links auf Begriffsklärungen', + 'de': u'Bot: korrigiere Links auf Begriffsklärungen', }, 'replacements': [ (u'[[CD]]', u'[[Audio-CD|CD]]'), @@ -404,18 +404,18 @@ ], 'exceptions': { 'inside': [ - r'\[\[20. Juli 1944\]\]', # Hitler-Attentat - r'\[\[17. Juni 1953\]\]', # Ost-Berliner Volksaufstand - r'\[\[1. April 2000\]\]', # Film - r'\[\[11. September 2001\]\]', # Anschläge in den USA - r'\[\[7. Juli 2005\]\]', # Terroranschläge in Spanien + r'\[\[20. Juli 1944\]\]', # Hitler-Attentat + r'\[\[17. Juni 1953\]\]', # Ost-Berliner Volksaufstand + r'\[\[1. April 2000\]\]', # Film + r'\[\[11. September 2001\]\]', # Anschläge in den USA + r'\[\[7. Juli 2005\]\]', # Terroranschläge in Spanien ], } }, 'isbn': { 'regex': True, - 'msg': 'isbn-formatting', # use i18n translations + 'msg': 'isbn-formatting', # use i18n translations 'replacements': [ # colon (r'ISBN: (\d+)', r'ISBN \1'), @@ -425,8 +425,8 @@ # hyphen-minus as separator, or spaces between digits and separators. # Note that these regular expressions also match valid ISBNs, but # these won't be changed. - (ur'ISBN (978|979) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d)(?!\d)', r'ISBN \1-\2-\3-\4-\5'), # ISBN-13 - (ur'ISBN (\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d|X|x)(?!\d)', r'ISBN \1-\2-\3-\4'), # ISBN-10 + (ur'ISBN (978|979) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d)(?!\d)', r'ISBN \1-\2-\3-\4-\5'), # ISBN-13 + (ur'ISBN (\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d+) *[\- −\.‐-―] *(\d|X|x)(?!\d)', r'ISBN \1-\2-\3-\4'), # ISBN-10 # missing space before ISBN-10 or before ISBN-13, # or non-breaking space. (r'ISBN(| | )((\d(-?)){12}\d|(\d(-?)){9}[\dXx])', r'ISBN \2'), @@ -437,8 +437,8 @@ 'hyperlink', ], 'inside': [ - r'ISBN (\d(-?)){12}\d', # matches valid ISBN-13s - r'ISBN (\d(-?)){9}[\dXx]', # matches valid ISBN-10s + r'ISBN (\d(-?)){12}\d', # matches valid ISBN-13s + r'ISBN (\d(-?)){9}[\dXx]', # matches valid ISBN-10s ], } }, @@ -449,7 +449,7 @@ 'correct-ar': { 'regex': True, 'msg': { - 'ar':u'تدقيق إملائي', + 'ar': u'تدقيق إملائي', }, 'replacements': [ #(u' ,', u' ،'), #FIXME: Do not replace comma in non-Arabic text, interwiki, image links or <math> syntax. @@ -556,7 +556,7 @@ 'regex': False, 'msg': { 'en': u'Robot: Fixing special page capitalisation', - 'fa':u'ربات: تصحیح بزرگی و کوچکی حروف صفحه‌های ویژه', + 'fa': u'ربات: تصحیح بزرگی و کوچکی حروف صفحه‌های ویژه', }, 'replacements': [ (u'Special:Allpages', u'Special:AllPages'), @@ -586,13 +586,13 @@ 'regex': False, 'nocase': True, 'msg': { - 'de': u'Bot: Ersetze Links auf .yu-Domains', - 'en': u'Robot: Replacing links to .yu domains', - 'fa': u'ربات: جایگزینی پیوندها به دامنه‌ها با پسوند yu', - 'fr': u'Robot: Correction des liens pointant vers le domaine .yu, qui expire en 2009', + 'de': u'Bot: Ersetze Links auf .yu-Domains', + 'en': u'Robot: Replacing links to .yu domains', + 'fa': u'ربات: جایگزینی پیوندها به دامنه‌ها با پسوند yu', + 'fr': u'Robot: Correction des liens pointant vers le domaine .yu, qui expire en 2009', 'ksh': u'Bot: de ahle .yu-Domains loufe us, dröm ußjetuusch', - }, - 'replacements': [ + }, + 'replacements': [ (u'www.budva.cg.yu', u'www.budva.rs'), (u'spc.org.yu', u'spc.rs'), (u'www.oks.org.yu', u'www.oks.org.rs'), @@ -644,8 +644,8 @@ 'msg': { 'en': u'Robot: Fixing rich-editor html', 'fa': u'ربات: تصحیح اچ‌تی‌ام‌ال ویرایشگر پیشرفته', - }, - 'replacements': [ + }, + 'replacements': [ # replace with a new line (r'(?i) ', r'\n'), # replace   with a space -- To view, visit https://gerrit.wikimedia.org/r/79591 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibec26dc974cc3075bd7d71b35fc271e58851b15d Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> 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

1 0

[Gerrit] pep8: ignore E241, unignore family.py - change (pywikibot/core)
by jenkins-bot (Code Review) 21 Aug '13

21 Aug '13

jenkins-bot has submitted this change and it was merged. Change subject: pep8: ignore E241, unignore family.py ...................................................................... pep8: ignore E241, unignore family.py 77037541af2cde8b0343bdbe8c96369c5c01061d accidentally did not include the updated .pep8 file Change-Id: Idc2520fea94ae9e431e060be7eebba668d916945 --- M .pep8 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/.pep8 b/.pep8 index 0cb1d16..fa2c71e 100644 --- a/.pep8 +++ b/.pep8 @@ -1,4 +1,4 @@ [pep8] -ignore = E122 -exclude = distribute_setup.py,externals,user-config.py,./scripts/i18n/*,./pywikibot/date.py,./pywikibot/family.py +ignore = E122,E241 +exclude = distribute_setup.py,externals,user-config.py,./scripts/i18n/*,./pywikibot/date.py max_line_length = 256 -- To view, visit https://gerrit.wikimedia.org/r/80243 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc2520fea94ae9e431e060be7eebba668d916945 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
18
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits August 2013