Pywikibot-commits December 2014

pywikibot-commits@lists.wikimedia.org

2 participants
317 discussions

[Gerrit] Don't aggressively cache token requests in tests - change (pywikibot/core)
by jenkins-bot (Code Review) 13 Dec '14

13 Dec '14

jenkins-bot has submitted this change and it was merged. Change subject: Don't aggressively cache token requests in tests ...................................................................... Don't aggressively cache token requests in tests Tests aggressively cache all API responses, with the exception of requests containing 'lgpassword'. Announced recently, token handling on the server is changing. Brad Jorsch: 'Upcoming changes to token handling' https://lists.wikimedia.org/pipermail/mediawiki-api-announce/2014-August/00… pywikibot doesnt handle 'badtoken', which should cause the client to get a new token. As a result, re-running tests now fail with badtoken errors, and can only be corrected by deleting the data in tests/apicache. This patch tells the test layer to not use the API cache for any request containing 'intoken', so new tokens will be requested each test run. Change-Id: I9f7d86bd1a13eda3cc0b2170840c9d65e716dd20 --- M tests/__init__.py 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/__init__.py b/tests/__init__.py index 919064a..4176945 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -62,6 +62,13 @@ if not super(TestRequest, self)._load_cache(): return False + # tokens need careful management in the cache + # and cant be aggressively cached. + # FIXME: remove once 'badtoken' is reliably handled in api.py + if 'intoken' in self._uniquedescriptionstr(): + self._data = None + return False + if 'lgpassword' in self._uniquedescriptionstr(): self._data = None return False @@ -70,6 +77,9 @@ def _write_cache(self, data): """Write data except login details.""" + if 'intoken' in self._uniquedescriptionstr(): + return + if 'lgpassword' in self._uniquedescriptionstr(): return -- To view, visit https://gerrit.wikimedia.org/r/154987 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9f7d86bd1a13eda3cc0b2170840c9d65e716dd20 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

1 0

Broken: wikimedia/pywikibot-core#1786 (master - 666272c)
by Travis CI 13 Dec '14

13 Dec '14

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1786 Status: Broken Duration: 31 minutes and 0 seconds Commit: 666272c (master) Author: jenkins-bot Message: Merge "textlib.extract_templates_and_params tests" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/570547c45d0b...666272ce… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/43953897 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] textlib.extract_templates_and_params tests - change (pywikibot/core)
by jenkins-bot (Code Review) 13 Dec '14

13 Dec '14

jenkins-bot has submitted this change and it was merged. Change subject: textlib.extract_templates_and_params tests ...................................................................... textlib.extract_templates_and_params tests allow textlib.extract_templates_and_params_mwpfh to be accessed and tested even if config.mwparserfromhell is disabled. Delay import of mwparserfromhell until it is actually used. Merge common test results for mwpfh and regex, highlighting the case known to be different, and mention them in the docstring. Change-Id: Id6a17940f241d95d9e8dc9b86131dec3989ea36a --- M pywikibot/textlib.py M tests/textlib_tests.py 2 files changed, 119 insertions(+), 34 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 859c290..ed25218 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -14,19 +14,14 @@ __version__ = '$Id$' # -try: - import mwparserfromhell -except ImportError: - mwparserfromhell = False +import datetime +import re +import sys try: from collections import OrderedDict except ImportError: from ordereddict import OrderedDict - -import datetime -import re -import sys if sys.version_info[0] > 2: from html.parser import HTMLParser @@ -966,17 +961,53 @@ parameters, and if this results multiple parameters with the same name only the last value provided will be returned. - This uses a third party library (mwparserfromhell) if it is installed - and enabled in the user-config.py. Otherwise it falls back on a - regex based function defined below. + This uses the package L{mwparserfromhell} (mwpfh) if it is installed + and enabled by config.mwparserfromhell. Otherwise it falls back on a + regex based implementation. + + There are minor differences between the two implementations. + + The two implementations return nested templates in a different order. + i.e. for {{a|b={{c}}}}, mwpfh returns [a, c], whereas regex returns [c, a]. + + mwpfh preserves whitespace in parameter names and values. regex excludes + anything between  before parsing the text. @param text: The wikitext from which templates are extracted @type text: unicode or string @return: list of template name and params @rtype: list of tuple """ - if not (config.use_mwparserfromhell and mwparserfromhell): + use_mwparserfromhell = config.use_mwparserfromhell + if use_mwparserfromhell: + try: + import mwparserfromhell # noqa + except ImportError: + use_mwparserfromhell = False + + if use_mwparserfromhell: + return extract_templates_and_params_mwpfh(text) + else: return extract_templates_and_params_regex(text) + + +def extract_templates_and_params_mwpfh(text): + """ + Extract templates with params using mwparserfromhell. + + This function should not be called directly. + + Use extract_templates_and_params, which will select this + mwparserfromhell implementation if based on whether the + mwparserfromhell package is installed and enabled by + config.mwparserfromhell. + + @param text: The wikitext from which templates are extracted + @type text: unicode or string + @return: list of template name and params + @rtype: list of tuple + """ + import mwparserfromhell code = mwparserfromhell.parse(text) result = [] for template in code.filter_templates(recursive=True): diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 10dd200..630ced4 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -7,10 +7,6 @@ # __version__ = '$Id$' -try: - import mwparserfromhell -except ImportError: - mwparserfromhell = False import codecs import os @@ -53,24 +49,6 @@ def testCurrentBehaviour(self): self.assertContains("enwiki_help_editing", u"Editing") - - def testExtractTemplates(self): - if not (pywikibot.config.use_mwparserfromhell and mwparserfromhell): - raise unittest.SkipTest('mwparserfromhell not available or enabled') - func = textlib.extract_templates_and_params # It's really long. - self.assertEqual(func('{{a}}'), [('a', OrderedDict())]) - self.assertEqual(func('{{a|b=c}}'), [('a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{a|b|c=d}}'), [('a', OrderedDict((('1', 'b'), ('c', 'd'))))]) - self.assertEqual(func('{{a|b={{c}}}}'), [('a', OrderedDict((('b', '{{c}}'), ))), ('c', OrderedDict())]) - self.assertEqual(func('{{a|b=c|f=g|d=e|1=}}'), [('a', OrderedDict((('b', 'c'), ('f', 'g'), ('d', 'e'), ('1', ''))))]) - - def testExtractTemplatesRegex(self): - func = textlib.extract_templates_and_params_regex # It's really long. - self.assertEqual(func('{{a}}'), [('a', OrderedDict())]) - self.assertEqual(func('{{a|b=c}}'), [('a', OrderedDict((('b', 'c'), )))]) - self.assertEqual(func('{{a|b|c=d}}'), [('a', OrderedDict((('1', 'b'), ('c', 'd'))))]) - self.assertEqual(func('{{a|b={{c}}}}'), [('c', OrderedDict()), ('a', OrderedDict((('b', '{{c}}'), )))]) - self.assertEqual(func('{{a|b=c|f=g|d=e|1=}}'), [('a', OrderedDict((('b', 'c'), ('f', 'g'), ('d', 'e'), ('1', ''))))]) def testSpacesInSection(self): self.assertContains("enwiki_help_editing", u"Minor_edits") @@ -218,6 +196,82 @@ '[[Category:nasty{{{!}}]]', self.site) +class TestTemplateParams(TestCase): + + """Test to verify that template params extraction works.""" + + net = False + + def _extract_templates_params(self, func): + self.assertEqual(func('{{a}}'), [('a', OrderedDict())]) + self.assertEqual(func('{{ a}}'), [('a', OrderedDict())]) + self.assertEqual(func('{{a }}'), [('a', OrderedDict())]) + self.assertEqual(func('{{ a }}'), [('a', OrderedDict())]) + self.assertEqual(func('{{a|b=c}}'), [('a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{a|b|c=d}}'), [('a', OrderedDict((('1', 'b'), ('c', 'd'))))]) + self.assertEqual(func('{{a|b=c|f=g|d=e|1=}}'), [('a', OrderedDict((('b', 'c'), ('f', 'g'), ('d', 'e'), ('1', ''))))]) + self.assertEqual(func('{{a|1=2|c=d}}'), [('a', OrderedDict((('1', '2'), ('c', 'd'))))]) + self.assertEqual(func('{{a|c=d|1=2}}'), [('a', OrderedDict((('c', 'd'), ('1', '2'))))]) + self.assertEqual(func('{{a|5=d|a=b}}'), [('a', OrderedDict((('5', 'd'), ('a', 'b'))))]) + self.assertEqual(func('{{a|=2}}'), [('a', OrderedDict((('', '2'), )))]) + self.assertEqual(func('{{a|=|}}'), [('a', OrderedDict((('', ''), ('1', ''))))]) + self.assertEqual(func('{{a||}}'), [('a', OrderedDict((('1', ''), ('2', ''))))]) + self.assertEqual(func('{{a|b={{{1}}}}}'), [('a', OrderedDict((('b', '{{{1}}}'), )))]) + self.assertEqual(func('{{a|b=<noinclude>{{{1}}}</noinclude>}}'), [('a', OrderedDict((('b', '<noinclude>{{{1}}}</noinclude>'), )))]) + self.assertEqual(func('{{subst:a|b=c}}'), [('subst:a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{safesubst:a|b=c}}'), [('safesubst:a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{msgnw:a|b=c}}'), [('msgnw:a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{Template:a|b=c}}'), [('Template:a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{template:a|b=c}}'), [('template:a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{:a|b=c}}'), [(':a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{subst::a|b=c}}'), [('subst::a', OrderedDict((('b', 'c'), )))]) + + def test_extract_templates_params_mwpfh(self): + try: + import mwparserfromhell # noqa + except ImportError: + raise unittest.SkipTest('mwparserfromhell not available') + + func = textlib.extract_templates_and_params_mwpfh + self._extract_templates_params(func) + + self.assertEqual(func('{{a|}}'), [('a', OrderedDict((('1', ''), )))]) + + self.assertEqual(func('{{a| b=c}}'), [('a', OrderedDict(((' b', 'c'), )))]) + self.assertEqual(func('{{a|b =c}}'), [('a', OrderedDict((('b ', 'c'), )))]) + self.assertEqual(func('{{a|b= c}}'), [('a', OrderedDict((('b', ' c'), )))]) + self.assertEqual(func('{{a|b=c }}'), [('a', OrderedDict((('b', 'c '), )))]) + + self.assertEqual(func('{{a| b={{c}}}}'), [('a', OrderedDict(((' b', '{{c}}'), ))), ('c', OrderedDict())]) + self.assertEqual(func('{{a|b={{c}}}}'), [('a', OrderedDict((('b', '{{c}}'), ))), ('c', OrderedDict())]) + self.assertEqual(func('{{a|b= {{c}}}}'), [('a', OrderedDict((('b', ' {{c}}'), ))), ('c', OrderedDict())]) + self.assertEqual(func('{{a|b={{c}} }}'), [('a', OrderedDict((('b', '{{c}} '), ))), ('c', OrderedDict())]) + + self.assertEqual(func('{{a|b=}}'), [('a', OrderedDict((('b', ''), )))]) + + def test_extract_templates_params_regex(self): + func = textlib.extract_templates_and_params_regex + self._extract_templates_params(func) + + self.assertEqual(func('{{a|}}'), []) # FIXME: this is a bug + + self.assertEqual(func('{{a| b=c}}'), [('a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{a|b =c}}'), [('a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{a|b= c}}'), [('a', OrderedDict((('b', 'c'), )))]) + self.assertEqual(func('{{a|b=c }}'), [('a', OrderedDict((('b', 'c'), )))]) + + self.assertEqual(func('{{a| b={{c}}}}'), [('c', OrderedDict()), ('a', OrderedDict((('b', '{{c}}'), )))]) + self.assertEqual(func('{{a|b={{c}}}}'), [('c', OrderedDict()), ('a', OrderedDict((('b', '{{c}}'), )))]) + self.assertEqual(func('{{a|b= {{c}}}}'), [('c', OrderedDict()), ('a', OrderedDict((('b', '{{c}}'), )))]) + self.assertEqual(func('{{a|b={{c}} }}'), [('c', OrderedDict()), ('a', OrderedDict((('b', '{{c}}'), )))]) + + self.assertEqual(func('{{a|b=}}'), [('a', OrderedDict((('b', ''), )))]) + + def test_extract_templates_params(self): + self._extract_templates_params( + textlib.extract_templates_and_params) + + class TestLocalDigits(TestCase): """Test to verify that local digits are correctly being handled.""" -- To view, visit https://gerrit.wikimedia.org/r/179420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id6a17940f241d95d9e8dc9b86131dec3989ea36a Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Passed: wikimedia/pywikibot-core#1785 (master - 570547c)
by Travis CI 13 Dec '14

13 Dec '14

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1785 Status: Passed Duration: 31 minutes and 23 seconds Commit: 570547c (master) Author: John Vandenberg Message: Dont use 'gen' to refer to the generator factory Also use pagegenerators instead of alias pg Change-Id: I31aa4d113ce6ca021c559c0b489d1a6b1904c86e View the changeset: https://github.com/wikimedia/pywikibot-core/compare/a4aaccc57f16...570547c4… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/43938749 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Dont use 'gen' to refer to the generator factory - change (pywikibot/core)
by jenkins-bot (Code Review) 13 Dec '14

13 Dec '14

jenkins-bot has submitted this change and it was merged. Change subject: Dont use 'gen' to refer to the generator factory ...................................................................... Dont use 'gen' to refer to the generator factory Also use pagegenerators instead of alias pg Change-Id: I31aa4d113ce6ca021c559c0b489d1a6b1904c86e --- M scripts/coordinate_import.py M scripts/illustrate_wikidata.py 2 files changed, 10 insertions(+), 9 deletions(-) Approvals: Ricordisamoa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/coordinate_import.py b/scripts/coordinate_import.py index 844d69e..f4f680e 100644 --- a/scripts/coordinate_import.py +++ b/scripts/coordinate_import.py @@ -112,13 +112,13 @@ """ # Process global args and prepare generator args parser local_args = pywikibot.handle_args(args) - gen = pagegenerators.GeneratorFactory() + generator_factory = pagegenerators.GeneratorFactory() for arg in local_args: - if gen.handleArg(arg): + if generator_factory.handleArg(arg): continue - generator = gen.getCombinedGenerator() + generator = generator_factory.getCombinedGenerator() if generator: coordbot = CoordImportRobot(generator) diff --git a/scripts/illustrate_wikidata.py b/scripts/illustrate_wikidata.py index e6c327b..c6c5518 100644 --- a/scripts/illustrate_wikidata.py +++ b/scripts/illustrate_wikidata.py @@ -22,7 +22,8 @@ # import pywikibot -from pywikibot import pagegenerators as pg, WikidataBot + +from pywikibot import pagegenerators, WikidataBot docuReplacements = {'&params;': pywikibot.pagegenerators.parameterHelp} @@ -41,7 +42,7 @@ """ super(IllustrateRobot, self).__init__() - self.generator = pg.PreloadingGenerator(generator) + self.generator = pagegenerators.PreloadingGenerator(generator) self.wdproperty = wdproperty self.cacheSources() @@ -97,7 +98,7 @@ """ # Process global args and prepare generator args parser local_args = pywikibot.handle_args(args) - gen = pg.GeneratorFactory() + generator_factory = pagegenerators.GeneratorFactory() wdproperty = u'P18' @@ -108,10 +109,10 @@ u'Please enter the property you want to add:') else: wdproperty = arg[10:] - elif gen.handleArg(arg): - continue + else: + generator_factory.handleArg(arg) - generator = gen.getCombinedGenerator() + generator = generator_factory.getCombinedGenerator() if not generator: pywikibot.output('I need a generator with pages to work on') return -- To view, visit https://gerrit.wikimedia.org/r/179615 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I31aa4d113ce6ca021c559c0b489d1a6b1904c86e Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] update mw version - change (pywikibot/compat)
by jenkins-bot (Code Review) 13 Dec '14

13 Dec '14

jenkins-bot has submitted this change and it was merged. Change subject: update mw version ...................................................................... update mw version Change-Id: I97ad3542d888eb337466a74c995e9e10f91b05bd --- M family.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/family.py b/family.py index f343989..326fbd4 100644 --- a/family.py +++ b/family.py @@ -4963,7 +4963,7 @@ # Don't use this, use versionnumber() instead. This only exists # to not break family files. # Here we return the latest mw release of wikimedia projects - return '1.25wmf10' + return '1.25wmf11' def shared_image_repository(self, code): return ('commons', 'commons') -- To view, visit https://gerrit.wikimedia.org/r/179603 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I97ad3542d888eb337466a74c995e9e10f91b05bd Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Passed: wikimedia/pywikibot-core#1784 (master - a4aaccc)
by Travis CI 12 Dec '14

12 Dec '14

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1784 Status: Passed Duration: 48 minutes and 22 seconds Commit: a4aaccc (master) Author: John Vandenberg Message: Avoid imports which import Tk Change-Id: Ibd4245ab2a4cfdb9df3a7ed1d1e20ac6ac6e5ac0 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/e58478c490cb...a4aaccc5… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/43875362 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

Broken: wikimedia/pywikibot-core#1783 (master - e58478c)
by Travis CI 12 Dec '14

12 Dec '14

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #1783 Status: Broken Duration: 35 minutes and 9 seconds Commit: e58478c (master) Author: jenkins-bot Message: Merge "Tk: added missing config vars and tests" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/83bd1161ccb3...e58478c4… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/43867529 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Avoid imports which import Tk - change (pywikibot/core)
by jenkins-bot (Code Review) 12 Dec '14

12 Dec '14

jenkins-bot has submitted this change and it was merged. Change subject: Avoid imports which import Tk ...................................................................... Avoid imports which import Tk Change-Id: Ibd4245ab2a4cfdb9df3a7ed1d1e20ac6ac6e5ac0 --- M tests/tk_tests.py 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/tk_tests.py b/tests/tk_tests.py index 1b94a66..44ec660 100644 --- a/tests/tk_tests.py +++ b/tests/tk_tests.py @@ -15,9 +15,10 @@ import tkinter as Tkinter else: import Tkinter + from scripts import flickrripper + from pywikibot.userinterfaces.gui import EditBoxWindow + import pywikibot -from scripts import flickrripper -from pywikibot.userinterfaces.gui import EditBoxWindow from tests.aspects import unittest, TestCase, DefaultSiteTestCase -- To view, visit https://gerrit.wikimedia.org/r/179528 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd4245ab2a4cfdb9df3a7ed1d1e20ac6ac6e5ac0 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Tk: added missing config vars and tests - change (pywikibot/core)
by jenkins-bot (Code Review) 12 Dec '14

12 Dec '14

jenkins-bot has submitted this change and it was merged. Change subject: Tk: added missing config vars and tests ...................................................................... Tk: added missing config vars and tests Added two variables tkhorsize & tkvertsize to config2.py and added new test file in tests/tk_tests.py with tests for Tkinter and Tkdialog and disabled them on Travis. Bug: T75025 Change-Id: I51545f8f1a3e841bcfc6fe9b1da90f4265770725 --- M pywikibot/config2.py M pywikibot/userinterfaces/gui.py A tests/tk_tests.py 3 files changed, 75 insertions(+), 15 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 2a2be84..3d2a674 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -343,6 +343,11 @@ except: colorized_output = False +# An indication of the size of your screen, or rather the size of the screen +# to be shown, for flickrripper +tkhorsize = 1600 +tkvertsize = 1000 + # ############# EXTERNAL EDITOR SETTINGS ############## # The command for the editor you want to use. If set to None, a simple Tkinter # editor will be used. diff --git a/pywikibot/userinterfaces/gui.py b/pywikibot/userinterfaces/gui.py index 517178f..8bd2800 100644 --- a/pywikibot/userinterfaces/gui.py +++ b/pywikibot/userinterfaces/gui.py @@ -439,18 +439,3 @@ self.listbox.config(height=laenge, width=maxbreite + 2) # wait for user to push a button which will destroy (close) the window return self.list - - -if __name__ == "__main__": - import pywikibot - try: - root = Tkinter.Tk() - root.resizable(width=Tkinter.FALSE, height=Tkinter.FALSE) - root.title("pywikibot GUI") - page = pywikibot.Page(pywikibot.Site(), u'Main Page') - content = page.get() - myapp = EditBoxWindow(root) - myapp.bind("<Control-d>", myapp.debug) - v = myapp.edit(content, highlight=page.title()) - finally: - pywikibot.stopme() diff --git a/tests/tk_tests.py b/tests/tk_tests.py new file mode 100644 index 0000000..1b94a66 --- /dev/null +++ b/tests/tk_tests.py @@ -0,0 +1,70 @@ +# -*- coding: utf-8 -*- +"""Tests for the Tk UI.""" +# +# (C) Pywikibot team, 2008-2014 +# +# Distributed under the terms of the MIT license. +# +__version__ = '$Id$' + +import os +import sys + +if os.environ.get('PYWIKIBOT2_TEST_GUI', '0') == '1': + if sys.version_info[0] > 2: + import tkinter as Tkinter + else: + import Tkinter +import pywikibot +from scripts import flickrripper +from pywikibot.userinterfaces.gui import EditBoxWindow + +from tests.aspects import unittest, TestCase, DefaultSiteTestCase + + +class TestFlickrRipper(TestCase): + + """Test Tkdialog.""" + + net = True + + @classmethod + def setUpClass(cls): + if os.environ.get('PYWIKIBOT2_TEST_GUI', '0') != '1': + raise unittest.SkipTest('FlickrRipper tests are disabled on Travis-CI') + super(TestFlickrRipper, cls).setUpClass() + + def testTkdialog(self): + box = flickrripper.Tkdialog('foo', 'tests/data/MP_sounds.png', 'MP_sounds.png') + box.run() + + +class TestTkinter(DefaultSiteTestCase): + + """Test Tkinter.""" + + net = True + + @classmethod + def setUpClass(cls): + if os.environ.get('PYWIKIBOT2_TEST_GUI', '0') != '1': + raise unittest.SkipTest('Tkinter tests are disabled on Travis-CI') + super(TestTkinter, cls).setUpClass() + + def testTkinter(self): + root = Tkinter.Tk() + root.resizable(width=Tkinter.FALSE, height=Tkinter.FALSE) + root.title("pywikibot GUI") + page = pywikibot.Page(pywikibot.Site(), u'Main Page') + content = page.get() + myapp = EditBoxWindow(root) + myapp.bind("<Control-d>", myapp.debug) + v = myapp.edit(content, highlight=page.title()) + assert v is None + + +if __name__ == '__main__': + try: + unittest.main() + except SystemExit: + pass -- To view, visit https://gerrit.wikimedia.org/r/179122 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I51545f8f1a3e841bcfc6fe9b1da90f4265770725 Gerrit-PatchSet: 8 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Slepice1 <vojtin.j(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot <>

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits December 2014