Pywikibot-commits October 2015

pywikibot-commits@lists.wikimedia.org

2 participants
187 discussions

[Gerrit] Moderate Flow topics and posts - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Moderate Flow topics and posts ...................................................................... Moderate Flow topics and posts This change allows Pywikibot bots to moderate topics and posts using Flow's moderation system. Bug: T109308 Change-Id: I92f7c664d13f8397219a4045d782f4b1123610f5 --- M pywikibot/flow.py M pywikibot/site.py M tests/flow_edit_tests.py 3 files changed, 375 insertions(+), 5 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/flow.py b/pywikibot/flow.py index accc5d4..9ccb5f5 100644 --- a/pywikibot/flow.py +++ b/pywikibot/flow.py @@ -164,6 +164,10 @@ self._data = self.site.load_topic(self, format) return self._data + def _reload(self): + """Forcibly reload the topic's root post.""" + self.root._load(load_from_topic=True) + @classmethod def create_topic(cls, board, title, content, format='wikitext'): """Create and return a Topic object for a new topic on a Board. @@ -219,6 +223,11 @@ """Whether this topic is locked.""" return self.root._current_revision['isLocked'] + @property + def is_moderated(self): + """Whether this topic is moderated.""" + return self.root._current_revision['isModerated'] + def replies(self, format='wikitext', force=False): """A list of replies to this topic's root post. @@ -243,23 +252,60 @@ """ return self.root.reply(content, format) - def lock(self, reason='Closed'): + # Moderation + def lock(self, reason): """Lock this topic. @param reason: The reason for locking this topic @type reason: unicode """ self.site.lock_topic(self, True, reason) - self.root._load(load_from_topic=True) + self._reload() - def unlock(self, reason='Reopened'): + def unlock(self, reason): """Unlock this topic. @param reason: The reason for unlocking this topic @type reason: unicode """ self.site.lock_topic(self, False, reason) - self.root._load(load_from_topic=True) + self._reload() + + def delete_mod(self, reason): + """Delete this topic through the Flow moderation system. + + @param reason: The reason for deleting this topic. + @type reason: unicode + """ + self.site.delete_topic(self, reason) + self._reload() + + def hide(self, reason): + """Hide this topic. + + @param reason: The reason for hiding this topic. + @type reason: unicode + """ + self.site.hide_topic(self, reason) + self._reload() + + def suppress(self, reason): + """Suppress this topic. + + @param reason: The reason for suppressing this topic. + @type reason: unicode + """ + self.site.suppress_topic(self, reason) + self._reload() + + def restore(self, reason): + """Restore this topic. + + @param reason: The reason for restoring this topic. + @type reason: unicode + """ + self.site.restore_topic(self, reason) + self._reload() # Flow non-page-like objects @@ -375,6 +421,13 @@ """ return self._page + @property + def is_moderated(self): + """Whether this post is moderated.""" + if not hasattr(self, '_current_revision'): + self._load() + return self._current_revision['isModerated'] + def get(self, format='wikitext', force=False, sysop=False): """Return the contents of the post in the given format. @@ -445,3 +498,40 @@ data = self.site.reply_to_post(self.page, reply_to, content, format) post = Post(self.page, data['post-id']) return post + + # Moderation + def delete(self, reason): + """Delete this post through the Flow moderation system. + + @param reason: The reason for deleting this post. + @type reason: unicode + """ + self.site.delete_post(self, reason) + self._load() + + def hide(self, reason): + """Hide this post. + + @param reason: The reason for hiding this post. + @type reason: unicode + """ + self.site.hide_post(self, reason) + self._load() + + def suppress(self, reason): + """Suppress this post. + + @param reason: The reason for suppressing this post. + @type reason: unicode + """ + self.site.suppress_post(self, reason) + self._load() + + def restore(self, reason): + """Restore this post. + + @param reason: The reason for restoring this post. + @type reason: unicode + """ + self.site.restore_post(self, reason) + self._load() diff --git a/pywikibot/site.py b/pywikibot/site.py index 25dedf7..bd319d5 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -6325,7 +6325,7 @@ data = req.submit() return data['flow']['reply']['committed']['topic'] - @must_be('user') + @must_be('user', 'flow-lock') @need_extension('Flow') def lock_topic(self, page, lock, reason): """Lock or unlock a Flow topic. @@ -6348,6 +6348,164 @@ data = req.submit() return data['flow']['lock-topic']['committed']['topic'] + @must_be('user') + @need_extension('Flow') + def moderate_topic(self, page, state, reason): + """Moderate a Flow topic. + + @param page: A Flow topic + @type page: Topic + @param state: The new moderation state + @type state: str + @param reason: The reason to moderate the topic + @type reason: unicode + @return: Metadata returned by the API + @rtype: dict + """ + token = self.tokens['csrf'] + params = {'action': 'flow', 'page': page, 'token': token, + 'submodule': 'moderate-topic', 'mtreason': reason, + 'mtmoderationState': state} + req = self._request(parameters=params, use_get=False) + data = req.submit() + return data['flow']['moderate-topic']['committed']['topic'] + + @must_be('user', 'flow-delete') + @need_extension('Flow') + def delete_topic(self, page, reason): + """Delete a Flow topic. + + @param page: A Flow topic + @type page: Topic + @param reason: The reason to delete the topic + @type reason: unicode + @return: Metadata returned by the API + @rtype: dict + """ + return self.moderate_topic(page, 'delete', reason) + + @must_be('user', 'flow-hide') + @need_extension('Flow') + def hide_topic(self, page, reason): + """Hide a Flow topic. + + @param page: A Flow topic + @type page: Topic + @param reason: The reason to hide the topic + @type reason: unicode + @return: Metadata returned by the API + @rtype: dict + """ + return self.moderate_topic(page, 'hide', reason) + + @must_be('user', 'flow-suppress') + @need_extension('Flow') + def suppress_topic(self, page, reason): + """Suppress a Flow topic. + + @param page: A Flow topic + @type page: Topic + @param reason: The reason to suppress the topic + @type reason: unicode + @return: Metadata returned by the API + @rtype: dict + """ + return self.moderate_topic(page, 'suppress', reason) + + @must_be('user') + @need_extension('Flow') + def restore_topic(self, page, reason): + """Restore a Flow topic. + + @param page: A Flow topic + @type page: Topic + @param reason: The reason to restore the topic + @type reason: unicode + @return: Metadata returned by the API + @rtype: dict + """ + return self.moderate_topic(page, 'restore', reason) + + @must_be('user') + @need_extension('Flow') + def moderate_post(self, post, state, reason): + """Moderate a Flow post. + + @param post: A Flow post + @type post: Post + @param state: The new moderation state + @type state: str + @param reason: The reason to moderate the topic + @type reason: unicode + @return: Metadata returned by the API + @rtype: dict + """ + page = post.page + uuid = post.uuid + token = self.tokens['csrf'] + params = {'action': 'flow', 'page': page, 'token': token, + 'submodule': 'moderate-post', 'mpreason': reason, + 'mpmoderationState': state, 'mppostId': uuid} + req = self._request(parameters=params, use_get=False) + data = req.submit() + return data['flow']['moderate-post']['committed']['topic'] + + @must_be('user', 'flow-delete') + @need_extension('Flow') + def delete_post(self, post, reason): + """Delete a Flow post. + + @param post: A Flow post + @type post: Post + @param reason: The reason to delete the post + @type reason: unicode + @return: Metadata returned by the API + @rtype: dict + """ + return self.moderate_post(post, 'delete', reason) + + @must_be('user', 'flow-hide') + @need_extension('Flow') + def hide_post(self, post, reason): + """Hide a Flow post. + + @param post: A Flow post + @type post: Post + @param reason: The reason to hide the post + @type reason: unicode + @return: Metadata returned by the API + @rtype: dict + """ + return self.moderate_post(post, 'hide', reason) + + @must_be('user', 'flow-suppress') + @need_extension('Flow') + def suppress_post(self, post, reason): + """Suppress a Flow post. + + @param post: A Flow post + @type post: Post + @param reason: The reason to suppress the post + @type reason: unicode + @return: Metadata returned by the API + @rtype: dict + """ + return self.moderate_post(post, 'suppress', reason) + + @must_be('user') + @need_extension('Flow') + def restore_post(self, post, reason): + """Restore a Flow post. + + @param post: A Flow post + @type post: Post + @param reason: The reason to restore the post + @type reason: unicode + @return: Metadata returned by the API + @rtype: dict + """ + return self.moderate_post(post, 'restore', reason) + def watched_pages(self, sysop=False, force=False, step=None, total=None): """ Return watchlist. diff --git a/tests/flow_edit_tests.py b/tests/flow_edit_tests.py index 899274c..5ae7a54 100644 --- a/tests/flow_edit_tests.py +++ b/tests/flow_edit_tests.py @@ -173,6 +173,128 @@ self.assertFalse(topic.is_locked) +class TestFlowHide(TestCase): + + """Hiding topics and posts.""" + + family = 'test' + code = 'test' + + user = True + write = True + + def test_hide_topic(self): + """Hide and restore a test topic.""" + # Setup + topic = Topic(self.site, 'Topic:Sl4svodmrhzmpjjh') + if topic.is_moderated: + topic.restore('Pywikibot test') + self.assertFalse(topic.is_moderated) + # Hide + topic.hide('Pywikibot test') + self.assertTrue(topic.is_moderated) + # Restore + topic.restore('Pywikibot test') + self.assertFalse(topic.is_moderated) + + def test_hide_post(self): + """Hide and restore a test post.""" + # Setup + topic = Topic(self.site, 'Topic:Sl4svodmrhzmpjjh') + post = Post(topic, 'sq1qvoig1az8w7cd') + if post.is_moderated: + post.restore('Pywikibot test') + self.assertFalse(post.is_moderated) + # Hide + post.hide('Pywikibot test') + self.assertTrue(post.is_moderated) + # Restore + post.restore('Pywikibot test') + self.assertFalse(post.is_moderated) + + +class TestFlowDelete(TestCase): + + """Deleting topics and posts.""" + + family = 'test' + code = 'test' + + user = True + write = True + sysop = True + + def test_delete_topic(self): + """Delete and restore a test topic.""" + # Setup + topic = Topic(self.site, 'Topic:Sl4svodmrhzmpjjh') + if topic.is_moderated: + topic.restore('Pywikibot test') + self.assertFalse(topic.is_moderated) + # Delete + topic.delete_mod('Pywikibot test') + self.assertTrue(topic.is_moderated) + # Restore + topic.restore('Pywikibot test') + self.assertFalse(topic.is_moderated) + + def test_delete_post(self): + """Delete and restore a test post.""" + # Setup + topic = Topic(self.site, 'Topic:Sl4svodmrhzmpjjh') + post = Post(topic, 'sq1qvoig1az8w7cd') + if post.is_moderated: + post.restore('Pywikibot test') + self.assertFalse(post.is_moderated) + # Delete + post.delete('Pywikibot test') + self.assertTrue(post.is_moderated) + # Restore + post.restore('Pywikibot test') + self.assertFalse(post.is_moderated) + + +class TestFlowSuppress(TestCase): + + """Suppressing topics and posts.""" + + family = 'test' + code = 'test' + + user = True + write = True + sysop = True + + def test_suppress_post(self): + """Suppress and restore a test post.""" + # Setup + topic = Topic(self.site, 'Topic:Sl4svodmrhzmpjjh') + post = Post(topic, 'sq1qvoig1az8w7cd') + if post.is_moderated: + post.restore('Pywikibot test') + self.assertFalse(post.is_moderated) + # Suppress + post.suppress('Pywikibot test') + self.assertTrue(post.is_moderated) + # Restore + post.restore('Pywikibot test') + self.assertFalse(post.is_moderated) + + def test_suppress_topic(self): + """Suppress and restore a test topic.""" + # Setup + topic = Topic(self.site, 'Topic:Sl4svodmrhzmpjjh') + if topic.is_moderated: + topic.restore('Pywikibot test') + self.assertFalse(topic.is_moderated) + # Suppress + topic.suppress('Pywikibot test') + self.assertTrue(topic.is_moderated) + # Restore + topic.restore('Pywikibot test') + self.assertFalse(topic.is_moderated) + + class TestFlowEditFailure(TestCase): """Flow-related edit failure tests.""" -- To view, visit https://gerrit.wikimedia.org/r/233482 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I92f7c664d13f8397219a4045d782f4b1123610f5 Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Happy5214 <happy5214(a)gmail.com> Gerrit-Reviewer: Happy5214 <happy5214(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Mattflaschen <mflaschen(a)wikimedia.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] Add missing docstring to date module - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Add missing docstring to date module ...................................................................... Add missing docstring to date module Also deprecate/privatise encNoConv and MakeParameter, which were each only used once in this module. Change-Id: I21a2a360153c1a0d2bcbebc10f87e95f7380e88b --- M pywikibot/date.py M tox.ini 2 files changed, 31 insertions(+), 5 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/date.py b/pywikibot/date.py index dd63890..6e9e8ee 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -85,7 +85,7 @@ # def dh_noConv(value, pattern, limit): """Helper for decoding a single integer value, no conversion, no rounding.""" - return dh(value, pattern, encNoConv, decSinglVal, limit) + return dh(value, pattern, lambda i: i, decSinglVal, limit) def dh_dayOfMnth(value, pattern): @@ -152,40 +152,48 @@ def dh_number(value, pattern): + """Helper for decoding a number.""" return dh_noConv(value, pattern, formatLimits['Number'][0]) def dh_centuryAD(value, pattern): + """Helper for decoding an AD century.""" return dh_noConv(value, pattern, formatLimits['CenturyAD'][0]) def dh_centuryBC(value, pattern): + """Helper for decoding an BC century.""" return dh_noConv(value, pattern, formatLimits['CenturyBC'][0]) def dh_millenniumAD(value, pattern): + """Helper for decoding an AD millennium.""" return dh_noConv(value, pattern, formatLimits['MillenniumAD'][0]) def dh_millenniumBC(value, pattern): + """Helper for decoding an BC millennium.""" return dh_noConv(value, pattern, formatLimits['MillenniumBC'][0]) def decSinglVal(v): + """Return first item in list v.""" return v[0] +@deprecated def encNoConv(i): + """Return i.""" return i def encDec0(i): - # round to the nearest decade, decade starts with a '0'-ending year + """Round to the nearest decade, decade starts with a '0'-ending year.""" return (i // 10) * 10 def encDec1(i): - # round to the nearest decade, decade starts with a '1'-ending year + """Round to the nearest decade, decade starts with a '1'-ending year.""" return encDec0(i) + 1 @@ -212,6 +220,7 @@ def dh_singVal(value, match): + """Helper function to match a single value to a constant.""" return dh_constVal(value, 0, match) @@ -248,6 +257,7 @@ def monthName(lang, ind): + """Return the month name for a language.""" return formats['MonthName'][lang](ind) @@ -278,11 +288,12 @@ def intToLocalDigitsStr(value, digitsToLocalDict): - # Encode an integer value into a textual form. + """Encode an integer value into a textual form.""" return unicode(value).translate(digitsToLocalDict) def localDigitsStrToInt(value, digitsToLocalDict, localToDigitsDict): + """Convert digits to integer.""" # First make sure there are no real digits in the string tmp = value.translate(digitsToLocalDict) # Test if tmp == value: @@ -301,12 +312,14 @@ def intToRomanNum(i): + """Convert integer to roman numeral.""" if i >= len(_romanNumbers): raise IndexError(u'Roman value %i is not defined' % i) return _romanNumbers[i] def romanNumToInt(v): + """Convert roman numeral to integer.""" return _romanNumbers.index(v) # Each tuple must 3 parts: a list of all possible digits (symbols), encoder @@ -457,6 +470,9 @@ params = encf(value) + # name 'MakeParameter' kept to avoid breaking blame below + MakeParameter = _make_parameter + if type(params) in _listTypes: if len(params) != len(decoders): raise AssertionError( @@ -475,7 +491,7 @@ return strPattern % MakeParameter(decoders[0], params) -def MakeParameter(decoder, param): +def _make_parameter(decoder, param): newValue = decoder[1](param) if len(decoder) == 4 and len(newValue) < decoder[3]: # force parameter length by taking the first digit in the list and @@ -483,6 +499,12 @@ # This converts "205" into "0205" for "%4d" newValue = decoder[0][0] * (decoder[3] - len(newValue)) + newValue return newValue + + +@deprecated +def MakeParameter(decoder, param): + """DEPRECATED.""" + return _make_parameter(decoder, param) # # All years/decades/centuries/millenniums are designed in such a way @@ -1964,11 +1986,13 @@ def addFmt2(lang, isMnthOfYear, pattern, makeUpperCase=None): + """Update yrMnthFmts and dayMnthFmts using addFmt1.""" addFmt1(lang, isMnthOfYear, makeMonthNamedList(lang, pattern, makeUpperCase)) def makeMonthList(pattern): + """Return a list of 12 elements based on the number of the month.""" return [pattern % m for m in range(1, 13)] @@ -2370,6 +2394,7 @@ def formatYear(lang, year): + """Return year name in a language.""" if year < 0: return formats['YearBC'][lang](-year) else: diff --git a/tox.ini b/tox.ini index e4b43ee..3a8b968 100644 --- a/tox.ini +++ b/tox.ini @@ -64,6 +64,7 @@ pywikibot/config2.py \ pywikibot/daemonize.py \ pywikibot/data/ \ + pywikibot/date.py \ pywikibot/diff.py \ pywikibot/echo.py \ pywikibot/editor.py \ -- To view, visit https://gerrit.wikimedia.org/r/246420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I21a2a360153c1a0d2bcbebc10f87e95f7380e88b Gerrit-PatchSet: 5 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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

Passed: wikimedia/pywikibot-core#3027 (2.0 - b1f6f39)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3027 Status: Passed Duration: 23 minutes and 10 seconds Commit: b1f6f39 (2.0) Author: Fabian Neundorf Message: [FIX] config: Don't crash on later get_base_dir calls All module variables starting with only one underscore get deleted after the module's instantiation and with 2b07db2a the variable to store whether no user config should be loaded was stored in such a variable and thus deleted so that when `get_base_dir` was called afterwards it would crash because it is missing. This patch renames the variable into using two underscores to still hide it's presence but prevent it from deletion after the instantiation. Conflicts: pywikibot/config2.py Change-Id: I538a73ff37da27a34ab732becafbf5a58b72a464 (cherry picked from commit c29a59f95803f517f0fb9a999b59db94b7085404) View the changeset: https://github.com/wikimedia/pywikibot-core/compare/408312706088...b1f6f390… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/85823547 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 7 months

Errored: wikimedia/pywikibot-core#3026 (master - 6908a9f)

by Travis CI

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3026 Status: Errored Duration: 45 minutes and 46 seconds Commit: 6908a9f (master) Author: jenkins-bot Message: Merge "[FIX] config: Don't crash on later get_base_dir calls" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/2f8c93f8bb75...6908a9fa… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/85816793 -- You can configure recipients for build notifications in your .travis.yml file. See http://docs.travis-ci.com/user/notifications

8 years, 7 months

[Gerrit] Prevent network activity during Jenkins nose tests - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Prevent network activity during Jenkins nose tests ...................................................................... Prevent network activity during Jenkins nose tests Jenkins nose tests should not use http, and the test framework attempts to ensure network activity is declared so that tests needing network activity can be skipped. However it is possible to bypass the test framework by declaring a test class does not use the network. Adding nose plugin detecthttp detects and prevents network activity. api.py doctests initiated network activity. Also use '!net' instead of "!net", so the command can be run on the bash command line without '!' being interpreted by bash. Bug: T115322 Change-Id: I863c1427a233e74445524ae88fd1df5bd5dc4099 --- M tox.ini 1 file changed, 5 insertions(+), 3 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index 529dd3d..b8328bc 100644 --- a/tox.ini +++ b/tox.ini @@ -9,7 +9,7 @@ envlist = flake8,flake8-py3,flake8-docstrings-mandatory [params] -nose_skip = --ignore-files=(gui\.py|botirc\.py|rcstream\.py) +nose_skip = --ignore-files=(gui\.py|botirc\.py|rcstream\.py|api\.py) flake8_ignore = D102,D103,{[flake8]ignore} [testenv] @@ -217,9 +217,10 @@ commands = python -W error::UserWarning -m generate_user_files -family:test -lang:test -v nosetests --version - nosetests --with-doctest -v -a "!net" tests pywikibot {[params]nose_skip} + nosetests --with-doctest --with-detecthttp -v -a '!net' tests pywikibot {[params]nose_skip} deps = nose + nose-detecthttp unicodecsv [testenv:nose34] @@ -227,9 +228,10 @@ commands = python -W error::UserWarning -m generate_user_files -family:test -lang:test -v nosetests --version - nosetests --with-doctest -v -a "!net" tests pywikibot {[params]nose_skip} + nosetests --with-doctest --with-detecthttp -v -a '!net' tests pywikibot {[params]nose_skip} deps = nose + nose-detecthttp>=0.1.3 # Python 3 support added six [testenv:venv] -- To view, visit https://gerrit.wikimedia.org/r/246135 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I863c1427a233e74445524ae88fd1df5bd5dc4099 Gerrit-PatchSet: 7 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Hashar <hashar(a)free.fr> Gerrit-Reviewer: JanZerebecki <jan.wikimedia(a)zerebecki.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] [FIX] config: Don't crash on later get_base_dir calls - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] config: Don't crash on later get_base_dir calls ...................................................................... [FIX] config: Don't crash on later get_base_dir calls All module variables starting with only one underscore get deleted after the module's instantiation and with 2b07db2a the variable to store whether no user config should be loaded was stored in such a variable and thus deleted so that when `get_base_dir` was called afterwards it would crash because it is missing. This patch renames the variable into using two underscores to still hide it's presence but prevent it from deletion after the instantiation. Conflicts: pywikibot/config2.py Change-Id: I538a73ff37da27a34ab732becafbf5a58b72a464 (cherry picked from commit c29a59f95803f517f0fb9a999b59db94b7085404) --- M pywikibot/config2.py 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config2.py b/pywikibot/config2.py index f9dcab8..f2d644f 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -60,9 +60,9 @@ # names and some magic variables (like __name__) _imports = frozenset(name for name in globals() if not name.startswith('_')) -_no_user_config = os.environ.get('PYWIKIBOT2_NO_USER_CONFIG') -if _no_user_config == '0': - _no_user_config = None +__no_user_config = os.environ.get('PYWIKIBOT2_NO_USER_CONFIG') +if __no_user_config == '0': + __no_user_config = None class _ConfigurationDeprecationWarning(UserWarning): @@ -297,8 +297,8 @@ # check if user-config.py is in base_dir if not exists(base_dir): exc_text = "No user-config.py found in directory '%s'.\n" % base_dir - if _no_user_config: - if _no_user_config != '2': + if __no_user_config: + if __no_user_config != '2': print(exc_text) else: exc_text += " Please check that user-config.py is stored in the correct location.\n" @@ -905,8 +905,8 @@ # Get the user files _thislevel = 0 -if _no_user_config: - if _no_user_config != '2': +if __no_user_config: + if __no_user_config != '2': print("WARNING: Skipping loading of user-config.py.") _fns = [] else: @@ -1004,7 +1004,7 @@ # Fix up default site -if family == 'wikipedia' and mylang == 'language' and _no_user_config != '2': +if family == 'wikipedia' and mylang == 'language' and __no_user_config != '2': print("WARNING: family and mylang are not set.\n" "Defaulting to family='test' and mylang='test'.") family = mylang = 'test' -- To view, visit https://gerrit.wikimedia.org/r/246942 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I538a73ff37da27a34ab732becafbf5a58b72a464 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: 2.0 Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] [FIX] config: Don't crash on later get_base_dir calls - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] config: Don't crash on later get_base_dir calls ...................................................................... [FIX] config: Don't crash on later get_base_dir calls All module variables starting with only one underscore get deleted after the module's instantiation and with 2b07db2a the variable to store whether no user config should be loaded was stored in such a variable and thus deleted so that when `get_base_dir` was called afterwards it would crash because it is missing. This patch renames the variable into using two underscores to still hide it's presence but prevent it from deletion after the instantiation. Change-Id: I538a73ff37da27a34ab732becafbf5a58b72a464 --- M pywikibot/config2.py 1 file changed, 8 insertions(+), 8 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 4cac315..8fd624e 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -70,9 +70,9 @@ # names and some magic variables (like __name__) _imports = frozenset(name for name in globals() if not name.startswith('_')) -_no_user_config = os.environ.get('PYWIKIBOT2_NO_USER_CONFIG') -if _no_user_config == '0': - _no_user_config = None +__no_user_config = os.environ.get('PYWIKIBOT2_NO_USER_CONFIG') +if __no_user_config == '0': + __no_user_config = None class _ConfigurationDeprecationWarning(UserWarning): @@ -323,8 +323,8 @@ # check if user-config.py is in base_dir if not exists(base_dir): exc_text = "No user-config.py found in directory '%s'.\n" % base_dir - if _no_user_config: - if _no_user_config != '2': + if __no_user_config: + if __no_user_config != '2': output(exc_text) else: exc_text += " Please check that user-config.py is stored in the correct location.\n" @@ -935,8 +935,8 @@ # Get the user files _thislevel = 0 -if _no_user_config: - if _no_user_config != '2': +if __no_user_config: + if __no_user_config != '2': warning('Skipping loading of user-config.py.') _fns = [] else: @@ -1072,7 +1072,7 @@ # Fix up default site if family == 'wikipedia' and mylang == 'language': - if _no_user_config != '2': + if __no_user_config != '2': warning('family and mylang are not set.\n' "Defaulting to family='test' and mylang='test'.") family = mylang = 'test' -- To view, visit https://gerrit.wikimedia.org/r/246853 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I538a73ff37da27a34ab732becafbf5a58b72a464 Gerrit-PatchSet: 3 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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] protectedtitles is v1.15+ - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: protectedtitles is v1.15+ ...................................................................... protectedtitles is v1.15+ Change-Id: I0cd65d606e73b93122eb40e1071636434f1b8e71 --- M pywikibot/site.py M tests/site_tests.py 2 files changed, 7 insertions(+), 0 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index 8199c1f..d12555f 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -6141,6 +6141,10 @@ assert 'create' in self.protection_types(), \ "'create' should be a valid protection type." if type == 'create': + if MediaWikiVersion(self.version()) < MediaWikiVersion('1.15'): + raise NotImplementedError( + 'protectedpages(type=create) requires MW 1.15+') + return self._generator( api.PageGenerator, type_arg='protectedtitles', namespaces=namespaces, gptlevel=level, total=total) diff --git a/tests/site_tests.py b/tests/site_tests.py index b0b51f8..fd2f4e1 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -825,6 +825,9 @@ def test_protectedpages_create(self): """Test that protectedpages returns protected page titles.""" + if MediaWikiVersion(self.site.version()) < MediaWikiVersion('1.15'): + raise unittest.SkipTest('requires v1.15+') + pages = list(self.get_site().protectedpages(type='create', total=10)) for page in pages: self.assertFalse(page.exists()) -- To view, visit https://gerrit.wikimedia.org/r/246175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0cd65d606e73b93122eb40e1071636434f1b8e71 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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] Fix script test for imageharvest simulate - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix script test for imageharvest simulate ...................................................................... Fix script test for imageharvest simulate imageharvest uses BeautifulSoup version 3, which is not installed by setup (T115428). When BeautifulSoup version 3 is installed, the script test for imageharvest hangs waiting for input. Providing a url for the script allows it to load and exit cleanly. Change-Id: I8f85dae4a2589d5c03fe6151530f13e00e402e90 --- M tests/script_tests.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/script_tests.py b/tests/script_tests.py index 4f58633..090ebc1 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -94,6 +94,7 @@ 'catall': 'q\n', # q for quit 'editarticle': 'Test page\n', 'imageuncat': 'q\n', + 'imageharvest': 'https://upload.wikimedia.org/wikipedia/commons/8/80/Wikipedia-logo-v2.svg\n…', 'interwiki': 'Test page that should not exist\n', 'misspelling': 'q\n', 'pagefromfile': 'q\n', -- To view, visit https://gerrit.wikimedia.org/r/246126 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8f85dae4a2589d5c03fe6151530f13e00e402e90 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

[Gerrit] Fix ProofreadPage RST error - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Fix ProofreadPage RST error ...................................................................... Fix ProofreadPage RST error Change-Id: Iec8b38a41e77dfc8b6cf61bfa0a7d2ae635ac035 --- M pywikibot/proofreadpage.py 1 file changed, 8 insertions(+), 4 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py index d27b08b..5d0e9ba 100644 --- a/pywikibot/proofreadpage.py +++ b/pywikibot/proofreadpage.py @@ -5,6 +5,7 @@ The extension is supported by MW 1.21+. This module includes objects: + * ProofreadPage(Page) * FullHeader * IndexPage(Page) @@ -105,12 +106,15 @@ def index(self): """Get the Index page which contains ProofreadPage. + If there are many Index pages link to this ProofreadPage, and + the ProofreadPage is titled Page:<index title>/<page number>, + the Index page with the same title will be returned. + Otherwise None is returned in the case of multiple linked Index pages. + To force reload, delete index and call it again. - Returns: - None: if ProofreadPage is linked to no or several Index pages - and no inerence can be done from titles. - IndexPage: if ProofreadPage is linked to one Index page. + @return: the Index page for this ProofreadPage + @rtype: IndexPage or None """ if not hasattr(self, '_index'): index_ns = self.site.proofread_index_ns -- To view, visit https://gerrit.wikimedia.org/r/246814 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iec8b38a41e77dfc8b6cf61bfa0a7d2ae635ac035 Gerrit-PatchSet: 5 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: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

8 years, 7 months

← Newer
1
2
3
4
5
6
7
8
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits October 2015