Pywikibot-commits October 2014

pywikibot-commits@lists.wikimedia.org

1 participants
155 discussions

[Gerrit] Update Wikia's MediaWiki version to 1.19.20 - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Update Wikia's MediaWiki version to 1.19.20 ...................................................................... Update Wikia's MediaWiki version to 1.19.20 Change-Id: Ibfcef58d19080dff09758d5827f6dbbb245cec1d --- M pywikibot/families/lyricwiki_family.py M pywikibot/families/wikia_family.py M pywikibot/families/wowwiki_family.py 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/lyricwiki_family.py b/pywikibot/families/lyricwiki_family.py index 3a48529..a0bfcf9 100644 --- a/pywikibot/families/lyricwiki_family.py +++ b/pywikibot/families/lyricwiki_family.py @@ -24,7 +24,7 @@ def version(self, code): """Return the version for this family.""" - return '1.19.19' + return '1.19.20' def scriptpath(self, code): """Return the script path for this family.""" diff --git a/pywikibot/families/wikia_family.py b/pywikibot/families/wikia_family.py index 81ee442..9ab8cdd 100644 --- a/pywikibot/families/wikia_family.py +++ b/pywikibot/families/wikia_family.py @@ -27,7 +27,7 @@ def version(self, code): """Return the version for this family.""" - return "1.19.19" + return "1.19.20" def scriptpath(self, code): """Return the script path for this family.""" diff --git a/pywikibot/families/wowwiki_family.py b/pywikibot/families/wowwiki_family.py index aff88f7..6aa1ebf 100644 --- a/pywikibot/families/wowwiki_family.py +++ b/pywikibot/families/wowwiki_family.py @@ -65,4 +65,4 @@ def version(self, code): """Return the version for this family.""" - return '1.19.19' + return '1.19.20' -- To view, visit https://gerrit.wikimedia.org/r/164292 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibfcef58d19080dff09758d5827f6dbbb245cec1d Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Grunny <mwgrunny(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 <>

9 years, 6 months

[Gerrit] Update Wikia's MediaWiki version to 1.19.20 - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Update Wikia's MediaWiki version to 1.19.20 ...................................................................... Update Wikia's MediaWiki version to 1.19.20 Change-Id: Id41cef85510633833f7a851e5e88a355171c02b8 --- M families/lyricwiki_family.py M families/wikia_family.py M families/wowwiki_family.py 3 files changed, 3 insertions(+), 3 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/families/lyricwiki_family.py b/families/lyricwiki_family.py index 05ce4b7..a6ad39c 100644 --- a/families/lyricwiki_family.py +++ b/families/lyricwiki_family.py @@ -41,7 +41,7 @@ def version(self, code): """Return the version for this family.""" - return '1.19.18' + return '1.19.20' def scriptpath(self, code): """Return the script path for this family.""" diff --git a/families/wikia_family.py b/families/wikia_family.py index 7b4c992..2c52e4e 100644 --- a/families/wikia_family.py +++ b/families/wikia_family.py @@ -46,7 +46,7 @@ def version(self, code): """Return the version for this family.""" - return "1.19.18" + return "1.19.20" def scriptpath(self, code): """Return the script path for this family.""" diff --git a/families/wowwiki_family.py b/families/wowwiki_family.py index 8e2c8c6..3c4665d 100644 --- a/families/wowwiki_family.py +++ b/families/wowwiki_family.py @@ -359,4 +359,4 @@ def version(self, code): """Return the version for this family.""" - return '1.19.18' + return '1.19.20' -- To view, visit https://gerrit.wikimedia.org/r/162864 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id41cef85510633833f7a851e5e88a355171c02b8 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Grunny <mwgrunny(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

9 years, 6 months

[Gerrit] generate_user_files: improve and fix listchoice() - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: generate_user_files: improve and fix listchoice() ...................................................................... generate_user_files: improve and fix listchoice() * listchoice() in generate_user_files.py no longer considers 0 and negative values as valid input. * 'clist' parameter is now mandatory to avoid entering infinte loop. * Improved function code and readability. Change-Id: Id4c891743a38d2b89fcba2f889ab7fc8e6ccd557 --- M generate_user_files.py 1 file changed, 8 insertions(+), 7 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_user_files.py b/generate_user_files.py index 5366687..d38cca0 100644 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -69,7 +69,7 @@ console_encoding = "iso-8859-1" -def listchoice(clist=[], message=None, default=None): +def listchoice(clist, message=None, default=None): if not message: message = u"Select" @@ -89,16 +89,17 @@ try: choice = int(choice) except ValueError: - pass - if isinstance(choice, basestring): + # User typed choice name if choice not in clist: print("Invalid response") + continue else: return choice - try: - return clist[int(choice) - 1] - except: - if not isinstance(choice, basestring): + + # User typed choice number + if 1 <= choice <= len(clist): + return clist[choice - 1] + else: print("Invalid response") -- To view, visit https://gerrit.wikimedia.org/r/164243 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id4c891743a38d2b89fcba2f889ab7fc8e6ccd557 Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Taueres <santoro.srg(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 <>

9 years, 6 months

[Gerrit] [IMPROV] Redirect testcase.assertRegexpMatches - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] Redirect testcase.assertRegexpMatches ...................................................................... [IMPROV] Redirect testcase.assertRegexpMatches With Python 3 the assertRegexpMatches was renamed to assertRegex, but the old name is still available (with a deprecation warning). To remove it, aspects.TestCase adds a assertRegex in Python 2 which calls the actual method. All usages have been replaced. Change-Id: I988ce51bf72293d93069ee3f1bfaac786febeb94 --- M tests/aspects.py M tests/site_tests.py 2 files changed, 11 insertions(+), 3 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/aspects.py b/tests/aspects.py index be4e36f..cbd870c 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -56,6 +56,14 @@ """ return self.assertRaisesRegexp(*args, **kwargs) + def assertRegex(self, *args, **kwargs): + """ + Wrapper of unittest.assertRegexpMatches for Python 2 unittest. + + assertRegexpMatches is deprecated in Python 3. + """ + return self.assertRegexpMatches(*args, **kwargs) + class TestTimerMixin(TestCaseBase): diff --git a/tests/site_tests.py b/tests/site_tests.py index c29d60d..c9b99bf 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -218,7 +218,7 @@ self.assertIsInstance(mysite.getcurrenttime(), pywikibot.Timestamp) ts = mysite.getcurrenttimestamp() self.assertIsInstance(ts, basestring) - self.assertRegexpMatches(ts, r'(19|20)\d\d[0-1]\d[0-3]\d[0-2]\d[0-5]\d[0-5]\d') + self.assertRegex(ts, r'(19|20)\d\d[0-1]\d[0-3]\d[0-2]\d[0-5]\d[0-5]\d') self.assertIsInstance(mysite.siteinfo, pywikibot.site.Siteinfo) self.assertIsInstance(mysite.months_names, list) @@ -1104,7 +1104,7 @@ try: token = self.mysite.tokens[ttype] except pywikibot.Error as error_msg: - self.assertRegexpMatches( + self.assertRegex( unicode(error_msg), "Action '[a-z]+' is not allowed for user .* on .* wiki.") else: @@ -1193,7 +1193,7 @@ self.assertIsInstance(mysite.siteinfo['timeoffset'], (int, float)) self.assertTrue(-12 * 60 <= mysite.siteinfo['timeoffset'] <= +14 * 60) self.assertEqual(mysite.siteinfo['timeoffset'] % 15, 0) - self.assertRegexpMatches(mysite.siteinfo['timezone'], "([A-Z]{3,4}|[A-Z][a-z]+/[A-Z][a-z]+)") + self.assertRegex(mysite.siteinfo['timezone'], "([A-Z]{3,4}|[A-Z][a-z]+/[A-Z][a-z]+)") self.assertIsInstance(datetime.strptime(mysite.siteinfo['time'], "%Y-%m-%dT%H:%M:%SZ"), datetime) self.assertGreater(mysite.siteinfo['maxuploadsize'], 0) self.assertIn(mysite.case(), ["first-letter", "case-sensitive"]) -- To view, visit https://gerrit.wikimedia.org/r/163761 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I988ce51bf72293d93069ee3f1bfaac786febeb94 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> 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 <>

9 years, 6 months

[Gerrit] pep257 docstrings fixs for bot.py - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: pep257 docstrings fixs for bot.py ...................................................................... pep257 docstrings fixs for bot.py Also: - added pywikibot/__init__.py to tox.ini. - sorted pep257 compatible files in tox.ini 'white-list'. Change-Id: I3acd4b6a944cbef9f50375332895abf0d10d3f92 --- M pywikibot/bot.py M tox.ini 2 files changed, 25 insertions(+), 10 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 941f4b0..bec306e 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -690,6 +690,7 @@ def showHelp(module_name=None): + """Show help for the Bot.""" if not module_name: module_name = calledModuleName() if not module_name: @@ -844,6 +845,7 @@ @property def current_page(self): + """Return the current working page as a property.""" return self._current_page @current_page.setter diff --git a/tox.ini b/tox.ini index 50daa29..ce3718d 100644 --- a/tox.ini +++ b/tox.ini @@ -26,18 +26,31 @@ [testenv:flake8-docstrings-mandatory] # Add any new file which is pep257 compatible commands = flake8 --jobs=1 --ignore=D102,D103,E122,E127,E241,E265 \ - ./pywikibot/echo.py ./pywikibot/config2.py ./pywikibot/weblib.py \ - ./pywikibot/fixes.py ./pywikibot/editor.py ./pywikibot/comms/http.py \ + ./pywikibot/__init__.py \ + ./pywikibot/bot.py \ + ./pywikibot/botirc.py \ + ./pywikibot/config2.py \ + ./pywikibot/echo.py \ + ./pywikibot/editor.py \ + ./pywikibot/family.py \ + ./pywikibot/fixes.py \ + ./pywikibot/interwiki_graph.py \ + ./pywikibot/page.py \ + ./pywikibot/plural.py \ + ./pywikibot/tools.py \ + ./pywikibot/version.py \ + ./pywikibot/weblib.py \ + ./pywikibot/comms/http.py \ + ./pywikibot/compat/userlib.py \ + ./pywikibot/compat/catlib.py \ + ./pywikibot/compat/query.py \ + ./pywikibot/data/__init__.py \ ./pywikibot/userinterfaces/transliteration.py \ ./pywikibot/userinterfaces/terminal_interface.py \ - ./pywikibot/page.py ./pywikibot/version.py ./pywikibot/plural.py \ - ./pywikibot/botirc.py ./pywikibot/interwiki_graph.py ./pywikibot/tools.py \ - ./pywikibot/bot.py ./pywikibot/family.py \ - ./pywikibot/data/__init__.py \ - ./pywikibot/compat/userlib.py ./pywikibot/compat/catlib.py \ - ./pywikibot/compat/query.py \ - ./scripts/claimit.py ./scripts/coordinate_import.py \ - ./scripts/harvest_template.py ./scripts/illustrate_wikidata.py \ + ./scripts/claimit.py \ + ./scripts/coordinate_import.py \ + ./scripts/harvest_template.py \ + ./scripts/illustrate_wikidata.py \ ./scripts/newitem.py \ ./tests/aspects.py -- To view, visit https://gerrit.wikimedia.org/r/163911 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3acd4b6a944cbef9f50375332895abf0d10d3f92 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(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 <>

9 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits October 2014