[Pywikibot-commits] [Gerrit] Split too long lines part II - change (pywikibot/core)

jenkins-bot has submitted this change and it was merged.

Change subject: Split too long lines part II ......................................................................

Split too long lines part II

The maximum is 150 characters now Alongside with some other minor pep8 fixes

Change-Id: I28c15577df3857a04d820ccd2f5558d92450f424 --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wiktionary_family.py M pywikibot/fixes.py M scripts/checkimages.py M scripts/image.py M scripts/interwiki.py M scripts/script_wui.py M scripts/states_redirect.py M scripts/weblinkchecker.py M tests/i18n/test.py M tests/pagegenerators_tests.py M tox.ini 12 files changed, 49 insertions(+), 32 deletions(-)

Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified

diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 6cbc6ab..eccb20f 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -54,7 +54,7 @@ self.obsolete = { 'aa': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Af... 'ak': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ak... - 'als': None, # https://als.wikipedia.org/wiki/Wikipedia:Stammtisch/Archiv_2008-1#Afterwards... + 'als': None, # https://als.wikipedia.org/wiki/Special:PermaLink/603754#Closing_wt.2C_wb.2C_... 'as': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_As... 'ast': None, 'ay': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ay... diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index bb2504f..374dc0a 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -97,7 +97,7 @@ 'aa': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Af... 'ab': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ab... 'ak': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ak... - 'als': None, # https://als.wikipedia.org/wiki/Wikipedia:Stammtisch/Archiv_2008-1#Afterwards... + 'als': None, # https://als.wikipedia.org/wiki/Special:PermaLink/603754#Closing_wt.2C_wb.2C_... 'as': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_As... 'av': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Av... 'ba': None, # https://meta.wikimedia.org/wiki/Proposals_for_closing_projects/Closure_of_Ba... diff --git a/pywikibot/fixes.py b/pywikibot/fixes.py index e2e3e4e..a045db3 100644 --- a/pywikibot/fixes.py +++ b/pywikibot/fixes.py @@ -129,14 +129,14 @@ # Temperaturangabe mit falsch gesetztem Leerzeichen (u'(?<!\w)(\d+|\d+[.,]\d+)° C(?=\W|²|³|$)', r'\1' + u' °C'), # Kein Leerzeichen nach Komma - (u'([a-zäöüß](]])?,)(([[)?[a-zäöüA-ZÄÖÜ])', r'\1 \3'), + (u'([a-zäöüß](]])?,)(([[)?[a-zäöüA-ZÄÖÜ])', r'\1 \3'), # Leerzeichen und Komma vertauscht - (u'([a-zäöüß](]])?) ,(([[)?[a-zäöüA-ZÄÖÜ])', r'\1, \3'), + (u'([a-zäöüß](]])?) ,(([[)?[a-zäöüA-ZÄÖÜ])', r'\1, \3'), # Plenks (d. h. Leerzeichen auch vor dem Komma/Punkt/Ausrufezeichen/Fragezeichen) # Achtung bei Französisch: https://de.wikipedia.org/wiki/Plenk#Sonderfall_Franz.C3.B6sisch # Leerzeichen vor Doppelpunkt/Semikolon kann korrekt sein, nach irgendeiner Norm für Zitationen. - (u'([a-zäöüß](]])?) ([,.!?]) (([[)?[a-zäöüA-ZÄÖÜ])', r'\1\3 \4'), - # (u'([a-z].)([A-Z])', r'\1 \2'), + (u'([a-zäöüß](]])?) ([,.!?]) (([[)?[a-zäöüA-ZÄÖÜ])', r'\1\3 \4'), + # (u'([a-z].)([A-Z])', r'\1 \2'), ], 'exceptions': { 'inside-tags': [ @@ -172,9 +172,11 @@ r'(?m)^;(.*?)$', # Definitionslisten, dort gibt es oft absichtlich Leerzeichen vor Doppelpunkten r'\d+h( |&nbsp;)\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'{{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 diff --git a/scripts/checkimages.py b/scripts/checkimages.py index 11cdf22..315c606 100644 --- a/scripts/checkimages.py +++ b/scripts/checkimages.py @@ -302,7 +302,9 @@ 'en': u"{{subst:image source|File:%s}} --~~~~", 'fa': u"{{جا:اخطار نگاره|%s}}", 'ga': u"{{subst:Foinse na híomhá|File:%s}} --~~~~", - 'hu': u"{{subst:adjforrást|Kép:%s}} \n Ezt az üzenetet ~~~ automatikusan helyezte el a vitalapodon, kérdéseddel fordulj a gazdájához, vagy a [[WP:KF|Kocsmafalhoz]]. --~~~~", + 'hu': u"{{subst:adjforrást|Kép:%s}} \n Ezt az üzenetet ~~~ automatikusan " + u"helyezte el a vitalapodon, kérdéseddel fordulj a gazdájához, vagy " + u"a [[WP:KF|Kocsmafalhoz]]. --~~~~", 'it': u"{{subst:Progetto:Coordinamento/Immagini/Bot/Messaggi/Senza licenza|%s|__botnick__}} --~~~~", 'ja': u"\n{{subst:Image copyright|File:%s}}--~~~~", 'ko': u'\n{{subst:User:Kwjbot IV/untagged|%s}} --~~~~', diff --git a/scripts/image.py b/scripts/image.py index 009478d..00758e4 100644 --- a/scripts/image.py +++ b/scripts/image.py @@ -147,7 +147,9 @@ # Be careful, spaces and _ have been converted to '\ ' and '_' escaped = re.sub('\\[_ ]', '[_ ]', escaped) if not self.getOption('loose') or not self.new_image: - image_regex = re.compile(r'[[ *(?:' + '|'.join(self.site.namespace(6, all=True)) + ')\s*:\s*' + escaped + ' *(?P<parameters>|[^\n]+|) *]]') + image_regex = re.compile( + r'[[ *(?:%s)\s*:\s*%s *(?P<parameters>|[^\n]+|) *]]' + % ('|'.join(self.site.namespace(6, all=True)), escaped)) else: image_regex = re.compile(r'' + escaped)

diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 1158110..93cb2f8 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -2587,7 +2587,10 @@ pywikibot.output(u"Dump file is empty?! Starting at the beginning.") nextPage = "!" namespace = 0 - hintlessPageGen = pagegenerators.CombinedPageGenerator([hintlessPageGen, pagegenerators.AllpagesPageGenerator(nextPage, namespace, includeredirects=False)]) + gen2 = pagegenerators.AllpagesPageGenerator( + nextPage, namespace, includeredirects=False) + hintlessPageGen = pagegenerators.CombinedPageGenerator( + [hintlessPageGen, gen2])

site.login() bot = InterwikiBot() diff --git a/scripts/script_wui.py b/scripts/script_wui.py index 12dea61..7250589 100755 --- a/scripts/script_wui.py +++ b/scripts/script_wui.py @@ -262,7 +262,11 @@ 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 @@ -283,7 +287,9 @@ # append to page outpage = pywikibot.Page(pywikibot.Site(), bot_config['ConfCSSoutput']) text = outpage.get() - 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)) + 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']))

diff --git a/scripts/states_redirect.py b/scripts/states_redirect.py index 2ec6898..879df31 100644 --- a/scripts/states_redirect.py +++ b/scripts/states_redirect.py @@ -97,25 +97,24 @@ % goal) except pywikibot.IsNotRedirectPage: pywikibot.warning( - u"Page %s already exists and is not a redirect\ - Please check page!" + u"Page %s already exists and is not a redirect " + u"Please check page!" % pl.title()) except pywikibot.NoPage: change = '' if page.isRedirectPage(): p2 = page.getRedirectTarget() - pywikibot.output(u'Note: goal page is redirect.\ - Creating redirect ' u'to "%s" to avoid double\ - redirect.' % p2.title()) + pywikibot.output( + u'Note: goal page is redirect.\nCreating redirect ' + u'to "%s" to avoid double redirect.' % p2.title()) else: p2 = page if self.force: change = 'y' else: - change = pywikibot.input_choice(u'Create redirect\ - %s?' % pl.title(), - (('yes', 'y'), - ('no', 'n'))) + change = pywikibot.input_choice( + u'Create redirect %s?' % pl.title(), + (('yes', 'y'), ('no', 'n'))) if change == 'y': pl.text = '#REDIRECT [[%s]]' % p2.title() pl.save(i18n.translate(self.site, msg)) diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index 4bc522f..a94bb79 100644 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -139,7 +139,8 @@

# Other special cases re.compile('.*[./@]gso.gbv.de(/.*)?'), # bot somehow can't handle their redirects - re.compile('.*[./@]berlinonline.de(/.*)?'), # a de: user wants to fix them by hand and doesn't want them to be deleted, see [[de:Benutzer:BLueFiSH.as/BZ]]. + re.compile('.*[./@]berlinonline.de(/.*)?'), + # above entry to be manually fixed per request at [[de:Benutzer:BLueFiSH.as/BZ]] re.compile('.*[./@]bodo.kommune.no(/.*)?'), # bot can't handle their redirects re.compile('.*[./@]jpl.nasa.gov(/.*)?'), # bot rejected on the site re.compile('.*[./@]itis.gov(/.*)?'), # bot rejected on the site diff --git a/tests/i18n/test.py b/tests/i18n/test.py index b2585f7..de5d92c 100644 --- a/tests/i18n/test.py +++ b/tests/i18n/test.py @@ -3,7 +3,9 @@ msg = { 'de': { 'test-plural': u'Bot: Ändere %(num)d {{PLURAL:num|Seite|Seiten}}.', - 'test-multiple-plurals': u'Bot: %(action)s %(line)s {{PLURAL:line|Zeile|Zeilen}} von {{PLURAL:%(page)d|einer|mehreren}} {{PLURAL:page|Seite|Seiten}}.', + 'test-multiple-plurals': + u'Bot: %(action)s %(line)s {{PLURAL:line|Zeile|Zeilen}} von ' + u'{{PLURAL:%(page)d|einer|mehreren}} {{PLURAL:page|Seite|Seiten}}.', }, 'en': { 'test-localized': u'test-localized EN', diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 2dec8dd..b6fc34d 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -760,12 +760,12 @@

def test_intersect_newpages_csd(self): site = self.get_site() - self.assertEqualItertools( - [pagegenerators.NewpagesPageGenerator(site=site, total=10), - pagegenerators.CategorizedPageGenerator( - pywikibot.Category(site, - 'Category:Candidates_for_speedy_deletion')) - ]) + self.assertEqualItertools([ + pagegenerators.NewpagesPageGenerator(site=site, total=10), + pagegenerators.CategorizedPageGenerator( + pywikibot.Category( + site, 'Category:Candidates_for_speedy_deletion'))] + )

class LiveRCPageGeneratorTestCase(WikimediaDefaultSiteTestCase): diff --git a/tox.ini b/tox.ini index 050b795..915cf18 100644 --- a/tox.ini +++ b/tox.ini @@ -136,10 +136,10 @@ [flake8] ignore = E122,E127,E241,E265 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* -max_line_length = 200 +max_line_length = 150

[pep8] ignore = E122,E127,E241 exclude = .tox,.git,./*.egg,ez_setup.py,build,externals,user-config.py,./scripts/i18n/* -max_line_length = 200 +max_line_length = 150