[Pywikibot-commits] [Gerrit] Doc: fix misc errors reported by Sphinx - change (pywikibot/core)

jenkins-bot has submitted this change and it was merged. Change subject: Doc: fix misc errors reported by Sphinx ...................................................................... Doc: fix misc errors reported by Sphinx Also comment out Sphinx `_static` setting. Change-Id: Ie90d88734f15995d82b3a0b029409bbc0a189fd8 --- M docs/conf.py M pywikibot/config2.py M pywikibot/i18n.py M pywikibot/page.py 4 files changed, 19 insertions(+), 12 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index a7b4ec4..2e59f19 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -122,7 +122,7 @@ # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] +# html_static_path = ['_static'] # If not '', a 'Last updated on:' timestamp is inserted at every page bottom, # using the given strftime format. diff --git a/pywikibot/config2.py b/pywikibot/config2.py index 971b19d..559a9cf 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -16,14 +16,17 @@ Provides two functions to register family classes which can be used in the user-config: + - register_family_file - register_families_folder Other functions made available to user-config: + - user_home_path Sets module global base_dir and provides utility methods to build paths relative to base_dir: + - makepath - datafilepath - shortpath diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index 69549f8..b80f9ac 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -519,15 +519,21 @@ value. Multiple plurals are allowed. As an examples, if we had several json dictionaries in test folder like: - en.json: - { + + en.json: + + { "test-plural": "Bot: Changing %(num)s {{PLURAL:%(num)d|page|pages}}.", - } - fr.json - { + } + + fr.json: + + { "test-plural": "Robot: Changer %(descr)s {{PLURAL:num|une page|quelques pages}}.", - } - and so on. + } + + and so on. + diff --git a/pywikibot/page.py b/pywikibot/page.py index 86290c7..c6b3f9b 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -1943,7 +1943,6 @@ @return: a generator that yields a tuple for each use of a template in the page, with the template Page as the first entry and a list of parameters as the second entry. - """ # WARNING: may not return all templates used in particularly # intricate cases such as template substitution @@ -2436,12 +2435,11 @@ @param cat: New category title (without namespace) or Category object @type cat: unicode or Category @param message: message to use for category creation message - If two %s are provided in message, will be replaced - by (self.title, authorsList) + If two %s are provided in message, will be replaced + by (self.title, authorsList) @type message: unicode @return: True if copying was successful, False if target page already existed. - """ # This seems far too specialized to be in the top-level framework # move to category.py? (Although it doesn't seem to be used there, -- To view, visit https://gerrit.wikimedia.org/r/214842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie90d88734f15995d82b3a0b029409bbc0a189fd8 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Hashar &lt;hashar(a)free.fr&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Ladsgroup &lt;ladsgroup(a)gmail.com&gt; Gerrit-Reviewer: Merlijn van Deen &lt;valhallasw(a)arctus.nl&gt; Gerrit-Reviewer: Siebrand &lt;siebrand(a)kitano.nl&gt; Gerrit-Reviewer: XZise &lt;CommodoreFabianus(a)gmx.de&gt; Gerrit-Reviewer: jenkins-bot <>