jenkins-bot has submitted this change and it was merged.
Change subject: Fix whitespace around URLs in docstrings
......................................................................
Fix whitespace around URLs in docstrings
Addresses sphinx doc errors in:
- APSite
- GoogleSearchPageGenerator
Update one URL to more specific page mw:API:Blocks.
Bug: T112491
Change-Id: Id835c8e5957fccf4b54defef2ab94b3df6561a43
---
M pywikibot/pagegenerators.py
M pywikibot/site.py
2 files changed, 12 insertions(+), 6 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/pagegenerators.py b/pywikibot/pagegenerators.py
index 8e42bf5..9953c79 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -2202,8 +2202,9 @@
"""
Page generator using Google search results.
- To use this generator, you need to install the package 'google'.
- https://pypi.python.org/pypi/google
+ To use this generator, you need to install the package 'google':
+
+ L{https://pypi.python.org/pypi/google}
This package has been available since 2010, hosted on github
since 2012, and provided by pypi since 2013.
@@ -2230,6 +2231,7 @@
The terms of service as at June 2014 give two conditions that
may apply to use of search:
+
1. Dont access [Google Services] using a method other than
the interface and the instructions that [they] provide.
2. Don't remove, obscure, or alter any legal notices
diff --git a/pywikibot/site.py b/pywikibot/site.py
index cbb092b..c2a26aa 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -4022,8 +4022,8 @@
Note that logevents only logs user blocks, while this method
iterates all blocks including IP ranges. The iterator yields dicts
- containing keys corresponding to the block properties (see
- https://www.mediawiki.org/wiki/API:Query_-_Lists for documentation).
+ containing keys corresponding to the block properties
+ (see L{https://www.mediawiki.org/wiki/API:Blocks}).
@param starttime: start iterating at this Timestamp
@param endtime: stop iterating at this Timestamp
@@ -5219,9 +5219,13 @@
@param expiry: The length or date/time when the block expires. If
'never', 'infinite', 'indefinite' it never does. If the value is
given as a basestring it's parsed by php's strtotime function:
- http://php.net/manual/en/function.strtotime.php
+
+ L{http://php.net/manual/en/function.strtotime.php}
+
The relative format is described there:
- http://php.net/manual/en/datetime.formats.relative.php
+
+ L{http://php.net/manual/en/datetime.formats.relative.php}
+
It is recommended to not use a basestring if possible to be
independent of the API.
@type expiry: Timestamp/datetime (absolute),
--
To view, visit https://gerrit.wikimedia.org/r/238084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id835c8e5957fccf4b54defef2ab94b3df6561a43
Gerrit-PatchSet: 5
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: XZise <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
