Pywikibot-commits January 2016

pywikibot-commits@lists.wikimedia.org

2 participants
115 discussions

Errored: wikimedia/pywikibot-core#3186 (master - 5dd68b8)
by Travis CI 17 Jan '16

17 Jan '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3186 Status: Errored Duration: 1 hour, 24 minutes, and 33 seconds Commit: 5dd68b8 (master) Author: jenkins-bot Message: Merge "Update doc strings" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/841a8ed716d2...5dd68b8a… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/102889076 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

Errored: wikimedia/pywikibot-core#3185 (master - 841a8ed)
by Travis CI 17 Jan '16

17 Jan '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3185 Status: Errored Duration: 1 hour, 9 minutes, and 16 seconds Commit: 841a8ed (master) Author: jenkins-bot Message: Merge "Implement support for monolingual text values" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/9b933290411c...841a8ed7… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/102888662 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Update doc strings - change (pywikibot/core)
by jenkins-bot (Code Review) 17 Jan '16

17 Jan '16

jenkins-bot has submitted this change and it was merged. Change subject: Update doc strings ...................................................................... Update doc strings - replace @return by @rtype identifier if the line describes the type - add some @rtype contents - Start with new line for multiple line doc string - remove empty line on bottom of doc string - replace @exception identifier by @raise Change-Id: I3f15785417c94c1a9ffc8ef43579db13d615193c --- M pywikibot/page.py M pywikibot/site.py 2 files changed, 412 insertions(+), 291 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index ac4c426..483560b 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -12,7 +12,7 @@ """ # -# (C) Pywikibot team, 2008-2015 +# (C) Pywikibot team, 2008-2016 # # Distributed under the terms of the MIT license. # @@ -79,18 +79,19 @@ class BasePage(UnicodeMixin, ComparableMixin): - """BasePage: Base object for a MediaWiki page. + """ + BasePage: Base object for a MediaWiki page. This object only implements internally methods that do not require reading from or writing to the wiki. All other methods are delegated to the Site object. Will be subclassed by Page, WikibasePage, and FlowPage. - """ def __init__(self, source, title=u"", ns=0): - """Instantiate a Page object. + """ + Instantiate a Page object. Three calling formats are supported: @@ -118,7 +119,6 @@ @param ns: namespace number; required if source is a Site, ignored otherwise @type ns: int - """ if title is None: raise ValueError(u'Title cannot be None.') @@ -150,7 +150,8 @@ return self._link.site def version(self): - """Return MediaWiki version number of the page site. + """ + Return MediaWiki version number of the page site. This is needed to use @need_version() decorator for methods of Page objects. @@ -168,7 +169,8 @@ return self.site.data_repository() def namespace(self): - """Return the number of the namespace of the page. + """ + Return the number of the namespace of the page. @return: namespace of the page @rtype: int @@ -183,7 +185,8 @@ @property def content_model(self): - """Return the content model for this page. + """ + Return the content model for this page. If it cannot be reliably determined via the API, None is returned. @@ -212,7 +215,8 @@ withSection=True, asUrl=False, asLink=False, allowInterwiki=True, forceInterwiki=False, textlink=False, as_filename=False, insite=None): - """Return the title of this Page, as a Unicode string. + """ + Return the title of this Page, as a Unicode string. @param underscore: (not used with asLink) if true, replace all ' ' characters with '_' @@ -234,7 +238,7 @@ @param insite: (only used if asLink is true) a site object where the title is to be shown. default is the current family/lang given by -family and -lang option i.e. config.family and config.mylang - + @rtype: unicode """ title = self._link.canonical_title() label = self._link.title @@ -289,11 +293,13 @@ @remove_last_args(('decode', 'underscore')) def section(self): - """Return the name of the section this Page refers to. + """ + Return the name of the section this Page refers to. The section is the part of the title following a '#' character, if any. If no section is present, return None. + @rtype: unicode """ return self._link.section @@ -339,14 +345,14 @@ self.title(asUrl=True)) def autoFormat(self): - """Return L{date.getAutoFormat} dictName and value, if any. + """ + Return L{date.getAutoFormat} dictName and value, if any. Value can be a year, date, etc., and dictName is 'YearBC', 'Year_December', or another dictionary name. Please note that two entries may have exactly the same autoFormat, but be in two different namespaces, as some sites have categories with the same names. Regular titles return (None, None). - """ if not hasattr(self, '_autoFormat'): from pywikibot import date @@ -364,7 +370,8 @@ change_edit_time=None, expandtemplates=None) def get(self, force=False, get_redirect=False, sysop=False): - """Return the wiki-text of the page. + """ + Return the wiki-text of the page. This will retrieve the page from the server if it has not been retrieved yet, or if force is True. This can raise the following @@ -383,6 +390,7 @@ @param sysop: if the user has a sysop account, use it to retrieve this page + @rtype: unicode """ if force: del self.latest_revision_id @@ -403,12 +411,12 @@ return None def _getInternals(self, sysop): - """Helper function for get(). + """ + Helper function for get(). Stores latest revision in self if it doesn't contain it, doesn't think. * Raises exceptions from previous runs. * Stores new exceptions in _getexception and raises them. - """ # Raise exceptions from previous runs if hasattr(self, '_getexception'): @@ -430,10 +438,11 @@ @deprecated_args(throttle=None, change_edit_time=None) def getOldVersion(self, oldid, force=False, get_redirect=False, sysop=False): - """Return text of an old revision of this page; same options as get(). + """ + Return text of an old revision of this page; same options as get(). @param oldid: The revid of the revision desired. - + @rtype: unicode """ if force or oldid not in self._revisions \ or self._revisions[oldid].text is None: @@ -448,7 +457,7 @@ """Return the permalink URL of an old revision of this page. @param oldid: The revid of the revision desired. - + @rtype: unicode """ return "//%s%s/index.php?title=%s&oldid=%s" \ % (self.site.hostname(), @@ -465,7 +474,8 @@ @latest_revision_id.deleter def latest_revision_id(self): - """Remove the latest revision id set for this Page. + """ + Remove the latest revision id set for this Page. All internal cached values specifically for the latest revision of this page are cleared. @@ -513,7 +523,8 @@ @property def text(self): - """Return the current (edited) wikitext, loading it if necessary. + """ + Return the current (edited) wikitext, loading it if necessary. @return: text of the page @rtype: unicode @@ -528,7 +539,8 @@ @text.setter def text(self, value): - """Update the current (edited) wikitext. + """ + Update the current (edited) wikitext. @param value: New value or None @param value: basestring @@ -544,14 +556,15 @@ del self._expanded_text def preloadText(self): - """The text returned by EditFormPreloadText. + """ + The text returned by EditFormPreloadText. See API module "info". Application: on Wikisource wikis, text can be preloaded even if a page does not exist, if an Index page is present. - @return: unicode + @rtype: unicode """ self.site.loadpageinfo(self, preload=True) return self._preloadedtext @@ -569,7 +582,7 @@ @param force: force updating from the live site - @return: dict + @rtype: dict """ if not hasattr(self, '_pageprops') or force: self._pageprops = {} # page may not have pageprops (see bug 54868) @@ -582,7 +595,7 @@ @param force: force updating from the live site - @return: unicode or None + @rtype: unicode or None """ return self.properties(force=force).get('defaultsort') @@ -594,7 +607,7 @@ @param includecomments: Also strip comments if includecomments parameter is not True. - @return: unicode or None + @rtype unicode or None """ if not hasattr(self, '_expanded_text') or ( self._expanded_text is None) or force: @@ -609,21 +622,24 @@ return self._expanded_text def userName(self): - """Return name or IP address of last user to edit page. + """ + Return name or IP address of last user to edit page. - @return: unicode + @rtype: unicode """ return self.latest_revision.user def isIpEdit(self): - """Return True if last editor was unregistered. + """ + Return True if last editor was unregistered. - @return: bool + @rtype: bool """ return self.latest_revision.anon def lastNonBotUser(self): - """Return name or IP address of last human/non-bot user to edit page. + """ + Return name or IP address of last human/non-bot user to edit page. Determine the most recent human editor out of the last revisions. If it was not able to retrieve a human user, returns None. @@ -632,7 +648,7 @@ i.e. which is not returned by Site.botusers(), it will be returned as a non-bot edit. - @return: unicode + @rtype: unicode """ if hasattr(self, '_lastNonBotUser'): return self._lastNonBotUser @@ -656,11 +672,12 @@ @property @deprecated('latest_revision.parent_id (0 instead of -1 when no parent)') def previous_revision_id(self): - """Return the revision id for the previous revision of this Page. + """ + Return the revision id for the previous revision of this Page. If the page has only one revision, it shall return -1. - @return: long + @rtype: long @raise AssertionError: Use on MediaWiki prior to v1.16. """ @@ -673,7 +690,7 @@ DEPRECATED: Use latest_revision.parent_id instead. - @return: long + @rtype: long @raise AssertionError: Use on MediaWiki prior to v1.16. """ @@ -685,7 +702,7 @@ If the title includes a section, return False if this section isn't found. - @return: bool + @rtype: bool """ return self.site.page_exists(self) @@ -712,7 +729,7 @@ @param force: Bypass local caching @type force: bool - @return: bool + @rtype: bool """ found = False if self.isRedirectPage(): @@ -726,9 +743,10 @@ return found def isCategoryRedirect(self): - """Return True if this is a category redirect page, False otherwise. + """ + Return True if this is a category redirect page, False otherwise. - @return: bool + @rtype: bool """ if not self.isCategory(): return False @@ -758,9 +776,10 @@ return bool(self._catredirect) def getCategoryRedirectTarget(self): - """If this is a category redirect, return the target category title. + """ + If this is a category redirect, return the target category title. - @return: Category + @rtype: Category """ if self.isCategoryRedirect(): return Category(Link(self._catredirect, self.site)) @@ -768,7 +787,8 @@ @deprecated("interwiki.page_empty_check(page)") def isEmpty(self): - """Return True if the page text has less than 4 characters. + """ + Return True if the page text has less than 4 characters. Character count ignores language links and category links. Can raise the same exceptions as get(). @@ -786,13 +806,15 @@ return ns >= 0 and ns % 2 == 1 def toggleTalkPage(self): - """Return other member of the article-talk page pair for this Page. + """ + Return other member of the article-talk page pair for this Page. If self is a talk page, returns the associated content page; otherwise, returns the associated talk page. The returned page need not actually exist on the wiki. @return: Page or None if self is a special page. + @rtype: Page or None """ ns = self.namespace() if ns < 0: # Special page @@ -819,7 +841,8 @@ @remove_last_args(('get_Index', )) def isDisambig(self): - """Return True if this is a disambiguation page, False otherwise. + """ + Return True if this is a disambiguation page, False otherwise. By default, it uses the the Disambiguator extension's result. The identification relies on the presense of the __DISAMBIG__ magic word @@ -882,7 +905,8 @@ def getReferences(self, follow_redirects=True, withTemplateInclusion=True, onlyTemplateInclusion=False, redirectsOnly=False, namespaces=None, step=None, total=None, content=False): - """Return an iterator all pages that refer to or embed the page. + """ + Return an iterator all pages that refer to or embed the page. If you need a full list of referring pages, use C{pages = list(s.getReferences())} @@ -899,7 +923,6 @@ @param total: iterate no more than this number of pages in total @param content: if True, retrieve the content of the current version of each referring page (default False) - """ # N.B.: this method intentionally overlaps with backlinks() and # embeddedin(). Depending on the interface, it may be more efficient @@ -920,7 +943,8 @@ def backlinks(self, followRedirects=True, filterRedirects=None, namespaces=None, step=None, total=None, content=False): - """Return an iterator for pages that link to this page. + """ + Return an iterator for pages that link to this page. @param followRedirects: if True, also iterate pages that link to a redirect pointing to the page. @@ -931,7 +955,6 @@ @param total: iterate no more than this number of pages in total @param content: if True, retrieve the content of the current version of each referring page (default False) - """ return self.site.pagebacklinks( self, @@ -945,7 +968,8 @@ def embeddedin(self, filter_redirects=None, namespaces=None, step=None, total=None, content=False): - """Return an iterator for pages that embed this page as a template. + """ + Return an iterator for pages that embed this page as a template. @param filter_redirects: if True, only iterate redirects; if False, omit redirects; if None, do not filter @@ -954,7 +978,6 @@ @param total: iterate no more than this number of pages in total @param content: if True, retrieve the content of the current version of each embedding page (default False) - """ return self.site.page_embeddedin( self, @@ -966,9 +989,10 @@ ) def protection(self): - """Return a dictionary reflecting page protections. + """ + Return a dictionary reflecting page protections. - @return: dict + @rtype: dict """ return self.site.page_restrictions(self) @@ -984,6 +1008,7 @@ protection types were removed. @return: set of unicode + @rtype: set """ # New API since commit 32083235eb332c419df2063cf966b3400be7ee8a if MediaWikiVersion(self.site.version()) >= MediaWikiVersion('1.25wmf14'): @@ -1000,18 +1025,20 @@ return p_types def canBeEdited(self): - """Determine whether the page may be edited. + """ + Determine whether the page may be edited. This returns True if and only if: - page is unprotected, and bot has an account for this site, or - page is protected, and bot has a sysop account for this site. - @return: bool + @rtype: bool """ return self.site.page_can_be_edited(self) def botMayEdit(self): - """Determine whether the active bot is allowed to edit the page. + """ + Determine whether the active bot is allowed to edit the page. This will be True if the page doesn't contain {{bots}} or {{nobots}}, or it contains them and the active bot is allowed to @@ -1023,7 +1050,7 @@ to override this by setting ignore_bot_templates=True in user-config.py, or using page.put(force=True). - @return: bool + @rtype: bool """ # TODO: move this to Site object? @@ -1074,7 +1101,8 @@ def save(self, summary=None, watch=None, minor=True, botflag=None, force=False, async=False, callback=None, apply_cosmetic_changes=None, quiet=False, **kwargs): - """Save the current contents of page's text to the wiki. + """ + Save the current contents of page's text to the wiki. @param summary: The edit summary for the modification (optional, but most wikis strongly encourage its use) @@ -1201,7 +1229,8 @@ @deprecated_args(comment='summary') def put(self, newtext, summary=u'', watchArticle=None, minorEdit=True, botflag=None, force=False, async=False, callback=None, **kwargs): - """Save the page with the contents of the first argument as the text. + """ + Save the page with the contents of the first argument as the text. This method is maintained primarily for backwards-compatibility. For new code, using Page.save() is preferred. See save() method @@ -1220,37 +1249,41 @@ def put_async(self, newtext, summary=u'', watchArticle=None, minorEdit=True, botflag=None, force=False, callback=None, **kwargs): - """Put page on queue to be saved to wiki asynchronously. + """ + Put page on queue to be saved to wiki asynchronously. Asynchronous version of put (takes the same arguments), which places pages on a queue to be saved by a daemon thread. All arguments are the same as for .put(). This version is maintained solely for backwards-compatibility. - """ self.put(newtext, summary=summary, watchArticle=watchArticle, minorEdit=minorEdit, botflag=botflag, force=force, async=True, callback=callback, **kwargs) def watch(self, unwatch=False): - """Add or remove this page to/from bot account's watchlist. + """ + Add or remove this page to/from bot account's watchlist. @param unwatch: True to unwatch, False (default) to watch. @type unwatch: bool - @return: bool; True if successful, False otherwise. + @return: True if successful, False otherwise. + @rtype: bool """ return self.site.watch(self, unwatch) def purge(self, **kwargs): - """Purge the server's cache for this page. + """ + Purge the server's cache for this page. - @return: bool + @rtype: bool """ return self.site.purgepages([self], **kwargs) def touch(self, callback=None, botflag=False, **kwargs): - """Make a touch edit for this page. + """ + Make a touch edit for this page. See save() method docs for all parameters. The following parameters will be overridden by this method: @@ -1273,7 +1306,8 @@ def linkedPages(self, namespaces=None, step=None, total=None, content=False): - """Iterate Pages that this Page links to. + """ + Iterate Pages that this Page links to. Only returns pages from "normal" internal links. Image and category links are omitted unless prefixed with ":". Embedded templates are @@ -1297,7 +1331,8 @@ total=total, content=content) def interwiki(self, expand=True): - """Iterate interwiki links in the page text, excluding language links. + """ + Iterate interwiki links in the page text, excluding language links. @param expand: if True (default), include interwiki links found in templates transcluded onto this page; if False, only iterate @@ -1305,6 +1340,7 @@ @type expand: bool @return: a generator that yields Link objects + @rtype: generator """ # This function does not exist in the API, so it has to be # implemented by screen-scraping @@ -1331,13 +1367,15 @@ continue def langlinks(self, include_obsolete=False): - """Return a list of all inter-language Links on this page. + """ + Return a list of all inter-language Links on this page. @param include_obsolete: if true, return even Link objects whose site is obsolete @type include_obsolete: bool @return: list of Link objects. + @rtype: list """ # Note: We preload a list of *all* langlinks, including links to # obsolete sites, and store that in self._langlinks. We then filter @@ -1352,7 +1390,8 @@ return [i for i in self._langlinks if not i.site.obsolete] def iterlanglinks(self, step=None, total=None, include_obsolete=False): - """Iterate all inter-language links on this page. + """ + Iterate all inter-language links on this page. @param step: limit each API call to this number of pages @param total: iterate no more than this number of pages in total @@ -1361,6 +1400,7 @@ @type include_obsolete: bool @return: a generator that yields Link objects. + @rtype: generator """ if hasattr(self, '_langlinks'): return iter(self.langlinks(include_obsolete=include_obsolete)) @@ -1375,7 +1415,7 @@ """ Convenience function to get the Wikibase item of a page. - @return: ItemPage + @rtype: ItemPage """ return ItemPage.fromPage(self) @@ -1386,7 +1426,8 @@ return self.templates() def templates(self, content=False): - """Return a list of Page objects for templates used on this Page. + """ + Return a list of Page objects for templates used on this Page. Template parameters are ignored. This method only returns embedded templates, not template pages that happen to be referenced through @@ -1403,7 +1444,8 @@ return self._templates def itertemplates(self, step=None, total=None, content=False): - """Iterate Page objects for templates used on this Page. + """ + Iterate Page objects for templates used on this Page. Template parameters are ignored. This method only returns embedded templates, not template pages that happen to be referenced through @@ -1414,7 +1456,6 @@ @param content: if True, retrieve the content of the current version of each template (default False) @param content: bool - """ if hasattr(self, '_templates'): return iter(self._templates) @@ -1423,14 +1464,14 @@ @deprecated_args(followRedirects=None, loose=None) def imagelinks(self, step=None, total=None, content=False): - """Iterate FilePage objects for images displayed on this Page. + """ + Iterate FilePage objects for images displayed on this Page. @param step: limit each API call to this number of pages @param total: iterate no more than this number of pages in total @param content: if True, retrieve the content of the current version of each image description page (default False) @return: a generator that yields FilePage objects. - """ return self.site.pageimages(self, step=step, total=total, content=content) @@ -1438,7 +1479,8 @@ @deprecated_args(nofollow_redirects=None, get_redirect=None) def categories(self, withSortKey=False, step=None, total=None, content=False): - """Iterate categories that the article is in. + """ + Iterate categories that the article is in. @param withSortKey: if True, include the sort key in each Category. @param step: limit each API call to this number of pages @@ -1446,7 +1488,7 @@ @param content: if True, retrieve the content of the current version of each category description page (default False) @return: a generator that yields Category objects. - + @rtype: generator """ # FIXME: bug 73561: withSortKey is ignored by Site.pagecategories if withSortKey: @@ -1456,22 +1498,25 @@ content=content) def extlinks(self, step=None, total=None): - """Iterate all external URLs (not interwiki links) from this page. + """ + Iterate all external URLs (not interwiki links) from this page. @param step: limit each API call to this number of pages @param total: iterate no more than this number of pages in total @return: a generator that yields unicode objects containing URLs. - + @rtype: generator """ return self.site.page_extlinks(self, step=step, total=total) def coordinates(self, primary_only=False): - """Return a list of Coordinate objects for points on the page. + """ + Return a list of Coordinate objects for points on the page. Uses the MediaWiki extension GeoData. @param primary_only: Only return the coordinate indicated to be primary @return: A list of Coordinate objects + @rtype: list """ if not hasattr(self, '_coords'): self._coords = [] @@ -1482,7 +1527,8 @@ return self._coords def getRedirectTarget(self): - """Return a Page object for the target this Page redirects to. + """ + Return a Page object for the target this Page redirects to. If this page is not a redirect page, will raise an IsNotRedirectPage exception. This method also can raise a NoPage exception. @@ -1493,7 +1539,8 @@ @deprecated('moved_target()') def getMovedTarget(self): - """Return a Page object for the target this Page was moved to. + """ + Return a Page object for the target this Page was moved to. DEPRECATED: Use Page.moved_target(). @@ -1509,7 +1556,8 @@ raise pywikibot.NoPage(self) def moved_target(self): - """Return a Page object for the target this Page was moved to. + """ + Return a Page object for the target this Page was moved to. If this page was not moved, it will raise a NoMoveTarget exception. This method also works if the source was already deleted. @@ -1543,7 +1591,8 @@ @deprecated_args(forceReload=None, revCount='total', getAll=None, reverseOrder='reverse') def getVersionHistory(self, reverse=False, step=None, total=None): - """Load the version history page and return history information. + """ + Load the version history page and return history information. Return value is a list of tuples, where each tuple represents one edit and is built of revision id, edit date/time, user name, and @@ -1552,7 +1601,6 @@ @param step: limit each API call to this number of revisions @param total: iterate no more than this number of revisions in total - """ return [rev.hist_entry() for rev in self.revisions(reverse=reverse, @@ -1577,7 +1625,6 @@ """Iterate previous versions including wikitext. Takes same arguments as getVersionHistory. - """ return [rev.full_hist_entry() for rev in self.revisions(content=True, reverse=reverse, @@ -1603,11 +1650,13 @@ @deprecated('contributors()') def contributingUsers(self, step=None, total=None): - """Return a set of usernames (or IPs) of users who edited this page. + """ + Return a set of usernames (or IPs) of users who edited this page. @param step: limit each API call to this number of revisions @param total: iterate no more than this number of revisions in total + @rtype: set """ return self.contributors(step=step, total=total).keys() @@ -1629,7 +1678,8 @@ @deprecated('oldest_revision') def getCreator(self): - """Get the first revision of the page. + """ + Get the first revision of the page. DEPRECATED: Use Page.oldest_revision. @@ -1641,12 +1691,14 @@ @deprecated('contributors() or revisions()') @deprecated_args(limit="total") def getLatestEditors(self, total=1): - """Get a list of revision informations of the last total edits. + """ + Get a list of revision informations of the last total edits. DEPRECATED: Use Page.revisions. @param total: iterate no more than this number of revisions in total - @rtype: list of dict, each dict containing the username and Timestamp + @return: list of dict, each dict containing the username and Timestamp + @rtype: list """ return [{'user': rev.user, 'timestamp': unicode(rev.timestamp.isoformat())} for rev in self.revisions(total=total)] @@ -1654,7 +1706,8 @@ @deprecate_arg("throttle", None) def move(self, newtitle, reason=None, movetalkpage=True, sysop=False, deleteAndMove=False, safe=True): - """Move this page to a new title. + """ + Move this page to a new title. @param newtitle: The new page title. @param reason: The edit summary for the move. @@ -1664,7 +1717,6 @@ (usually requires sysop privileges, depending on wiki settings) @param safe: If false, attempt to delete existing page at newtitle (if there is one) and then move this page to that title - """ if reason is None: pywikibot.output(u'Moving %s to [[%s]].' @@ -1678,7 +1730,8 @@ @deprecate_arg("throttle", None) def delete(self, reason=None, prompt=True, mark=False): - """Delete the page from the wiki. Requires administrator status. + """ + Delete the page from the wiki. Requires administrator status. @param reason: The edit summary for the deletion, or rationale for deletion if requesting. If None, ask for it. @@ -1686,7 +1739,6 @@ @param mark: If true, and user does not have sysop rights, place a speedy-deletion request on the page instead. If false, non-sysops will be asked before marking pages for deletion. - """ if reason is None: pywikibot.output(u'Deleting %s.' % (self.title(asLink=True))) @@ -1725,14 +1777,15 @@ return self.save(summary=reason) def loadDeletedRevisions(self, step=None, total=None): - """Retrieve deleted revisions for this Page. + """ + Retrieve deleted revisions for this Page. Stores all revisions' timestamps, dates, editors and comments in self._deletedRevs attribute. @return: iterator of timestamps (which can be used to retrieve revisions later on). - + @rtype: generator """ if not hasattr(self, "_deletedRevs"): self._deletedRevs = {} @@ -1742,13 +1795,14 @@ yield rev['timestamp'] def getDeletedRevision(self, timestamp, retrieveText=False): - """Return a particular deleted revision by timestamp. + """ + Return a particular deleted revision by timestamp. @return: a list of [date, editor, comment, text, restoration marker]. text will be None, unless retrieveText is True (or has been retrieved earlier). If timestamp is not found, returns None. - + @rtype: list """ if hasattr(self, "_deletedRevs"): if timestamp in self._deletedRevs and ( @@ -1763,7 +1817,8 @@ return item["revisions"][0] def markDeletedRevision(self, timestamp, undelete=True): - """Mark the revision identified by timestamp for undeletion. + """ + Mark the revision identified by timestamp for undeletion. @param undelete: if False, mark the revision to remain deleted. @type undelete: bool @@ -1777,7 +1832,8 @@ @deprecate_arg('throttle', None) @deprecate_arg('comment', 'reason') def undelete(self, reason=None): - """Undelete revisions based on the markers set by previous calls. + """ + Undelete revisions based on the markers set by previous calls. If no calls have been made since loadDeletedRevisions(), everything will be restored. @@ -1797,7 +1853,6 @@ @param reason: Reason for the action. @type reason: basestring - """ if hasattr(self, "_deletedRevs"): undelete_revs = [ts for ts, rev in self._deletedRevs.items() @@ -1815,7 +1870,8 @@ def protect(self, edit=False, move=False, create=None, upload=None, unprotect=False, reason=None, prompt=None, protections=None, **kwargs): - """(Un)protect a wiki page. Requires administrator status. + """ + Protect or unprotect a wiki page. Requires administrator status. Valid protection levels (in MediaWiki 1.12) are '' (equivalent to 'none'), 'autoconfirmed', and 'sysop'. If None is given, however, @@ -1911,7 +1967,6 @@ @return: True if page was saved changed, otherwise False. @rtype: bool - """ # get list of Category objects the article is in and remove possible # duplicates @@ -2019,7 +2074,6 @@ """Return the Page title encoded for use in an URL. DEPRECATED: use self.title(asUrl=True) instead. - """ return self.title(asUrl=True) @@ -2061,11 +2115,13 @@ @deprecate_arg("get_redirect", None) def templatesWithParams(self): - """Iterate templates used on this Page. + """ + Iterate templates used on this Page. @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. + @rtype: generator """ # WARNING: may not return all templates used in particularly # intricate cases such as template substitution @@ -2169,7 +2225,8 @@ class FilePage(Page): - """A subclass of Page representing a file description page. + """ + A subclass of Page representing a file description page. Supports the same interface as Page, with some added methods. """ @@ -2189,13 +2246,13 @@ @property def latest_file_info(self): - """Retrieve and store information of latest Image rev. of FilePage. + """ + Retrieve and store information of latest Image rev. of FilePage. At the same time, the whole history of Image is fetched and cached in self._file_revisions @return: instance of FileInfo() - """ if not len(self._file_revisions): self.site.loadimageinfo(self, history=True) @@ -2204,13 +2261,13 @@ @property def oldest_file_info(self): - """Retrieve and store information of oldest Image rev. of FilePage. + """ + Retrieve and store information of oldest Image rev. of FilePage. At the same time, the whole history of Image is fetched and cached in self._file_revisions @return: instance of FileInfo() - """ if not len(self._file_revisions): self.site.loadimageinfo(self, history=True) @@ -2218,12 +2275,13 @@ return self._file_revisions[oldest_ts] def get_file_history(self): - """Return the file's version history. + """ + Return the file's version history. @return: dictionary with: key: timestamp of the entry value: instance of FileInfo() - + @rtype: dict """ if not hasattr(self, '_file_revisions'): self.site.loadimageinfo(self, history=True) @@ -2249,16 +2307,18 @@ @deprecated("fileIsShared") def fileIsOnCommons(self): - """DEPRECATED. Check if the image is stored on Wikimedia Commons. + """ + DEPRECATED. Check if the image is stored on Wikimedia Commons. - @return: bool + @rtype: bool """ return self.fileIsShared() def fileIsShared(self): - """Check if the file is stored on any known shared repository. + """ + Check if the file is stored on any known shared repository. - @return: bool + @rtype: bool """ # as of now, the only known repositories are commons and wikitravel # TODO: put the URLs to family file @@ -2288,33 +2348,34 @@ @deprecated("FilePage.oldest_file_info.user") def getFirstUploader(self): - """Return a list with first uploader of the FilePage and timestamp. + """ + Return a list with first uploader of the FilePage and timestamp. For compatibility with compat only. - """ return [self.oldest_file_info.user, unicode(self.oldest_file_info.timestamp.isoformat())] @deprecated("FilePage.latest_file_info.user") def getLatestUploader(self): - """Return a list with latest uploader of the FilePage and timestamp. + """ + Return a list with latest uploader of the FilePage and timestamp. For compatibility with compat only. - """ return [self.latest_file_info.user, unicode(self.latest_file_info.timestamp.isoformat())] @deprecated('FilePage.get_file_history()') def getFileVersionHistory(self): - """Return the file's version history. + """ + Return the file's version history. @return: A list of dictionaries with the following keys: [comment, sha1, url, timestamp, metadata, height, width, mime, user, descriptionurl, size] - + @rtype: list """ return self.site.loadimageinfo(self, history=True) @@ -2333,13 +2394,13 @@ u'\n|----\n'.join(lines) + '\n|}' def usingPages(self, step=None, total=None, content=False): - """Yield Pages on which the file is displayed. + """ + Yield Pages on which the file is displayed. @param step: limit each API call to this number of pages @param total: iterate no more than this number of pages in total @param content: if True, load the current content of each iterated page (default False) - """ return self.site.imageusage( self, step=step, total=total, content=content) @@ -2359,7 +2420,6 @@ Constructor. All parameters are the same as for Page() constructor. - """ self.sortKey = sortKey Page.__init__(self, source, title, ns=14) @@ -2369,7 +2429,8 @@ @deprecated_args(forceInterwiki=None, textlink=None, noInterwiki=None) def aslink(self, sortKey=None): - """Return a link to place a page in this Category. + """ + Return a link to place a page in this Category. Use this only to generate a "true" category link, not for interwikis or text links to category pages. @@ -2377,7 +2438,6 @@ @param sortKey: The sort key for the article to be placed in this Category; if omitted, default sort key is used. @type sortKey: (optional) unicode - """ key = sortKey or self.sortKey if key is not None: @@ -2390,7 +2450,8 @@ @deprecated_args(startFrom=None, cacheResults=None) def subcategories(self, recurse=False, step=None, total=None, content=False): - """Iterate all subcategories of the current category. + """ + Iterate all subcategories of the current category. @param recurse: if not False or 0, also iterate subcategories of subcategories. If an int, limit recursion to this number of @@ -2402,7 +2463,6 @@ subcategories in total (at all levels) @param content: if True, retrieve the content of the current version of each category description page (default False) - """ if not isinstance(recurse, bool) and recurse: recurse = recurse - 1 @@ -2484,7 +2544,6 @@ @param endsort: if provided, only generate pages <= this title lexically; not valid if sortby="timestamp" @type endsort: str - """ for member in self.site.categorymembers(self, namespaces=namespaces, @@ -2547,13 +2606,21 @@ @pywikibot.site.need_version("1.13") def isEmptyCategory(self): - """Return True if category has no members (including subcategories).""" + """ + Return True if category has no members (including subcategories). + + @rtype: bool + """ ci = self.categoryinfo return sum(ci[k] for k in ['files', 'pages', 'subcats']) == 0 @pywikibot.site.need_version("1.11") def isHiddenCategory(self): - """Return True if the category is hidden.""" + """ + Return True if the category is hidden. + + @rtype: bool + """ return u'hiddencat' in self.properties() def copyTo(self, cat, message): @@ -2568,6 +2635,7 @@ @type message: unicode @return: True if copying was successful, False if target page already existed. + @rtype: bool """ # 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, @@ -2594,7 +2662,8 @@ return True def copyAndKeep(self, catname, cfdTemplates, message): - """Copy partial category page text (not contents) to a new title. + """ + Copy partial category page text (not contents) to a new title. Like copyTo above, except this removes a list of templates (like deletion templates) that appear in the old category text. It also @@ -2610,7 +2679,7 @@ from the page text @return: True if copying was successful, False if target page already existed. - + @rtype: bool """ # I don't see why we need this as part of the framework either # move to scripts/category.py? @@ -2643,13 +2712,14 @@ @property def categoryinfo(self): - """Return a dict containing information about the category. + """ + Return a dict containing information about the category. The dict contains values for: Numbers of pages, subcategories, files, and total contents. - @return: dict + @rtype: dict """ return self.site.categoryinfo(self) @@ -2748,14 +2818,16 @@ class User(Page): - """A class that represents a Wiki user. + """ + A class that represents a Wiki user. This class also represents the Wiki page User:<username> """ @deprecated_args(site="source", name="title") def __init__(self, source, title=u''): - """Initializer for a User object. + """ + Initializer for a User object. All parameters are the same as for Page() constructor. """ @@ -2778,18 +2850,19 @@ """ The username. - @return: unicode + @rtype: unicode """ return self.username @property def username(self): - """The username. + """ + The username. Convenience method that returns the title of the page with namespace prefix omitted, which is the username. - @return: unicode + @rtype: unicode """ if self._isAutoblock: return u'#' + self.title(withNamespace=False) @@ -2797,7 +2870,8 @@ return self.title(withNamespace=False) def isRegistered(self, force=False): - """Determine if the user is registered on the site. + """ + Determine if the user is registered on the site. It is possible to have a page named User:xyz and not have a corresponding user with username xyz. @@ -2808,7 +2882,7 @@ @param force: if True, forces reloading the data from API @type force: bool - @return: bool + @rtype: bool """ if self.isAnonymous(): return False @@ -2816,19 +2890,21 @@ return self.getprops(force).get('missing') is None def isAnonymous(self): - """Determine if the user is editing as an IP address. + """ + Determine if the user is editing as an IP address. - @return: bool + @rtype: bool """ return is_IP(self.username) def getprops(self, force=False): - """Return a properties about the user. + """ + Return a properties about the user. @param force: if True, forces reloading the data from API @type force: bool - @return: dict + @rtype: dict """ if force and hasattr(self, '_userprops'): del self._userprops @@ -2843,12 +2919,14 @@ @deprecated('User.registration()') def registrationTime(self, force=False): - """DEPRECATED. Fetch registration date for this user. + """ + DEPRECATED. Fetch registration date for this user. @param force: if True, forces reloading the data from API @type force: bool @return: long (MediaWiki's internal timestamp format) or 0 + @rtype: int or long """ if self.registration(): return long(self.registration().strftime('%Y%m%d%H%M%S')) @@ -2856,26 +2934,28 @@ return 0 def registration(self, force=False): - """Fetch registration date for this user. + """ + Fetch registration date for this user. @param force: if True, forces reloading the data from API @type force: bool - @return: pywikibot.Timestamp or None + @rtype: pywikibot.Timestamp or None """ reg = self.getprops(force).get('registration') if reg: return pywikibot.Timestamp.fromISOformat(reg) def editCount(self, force=False): - """Return edit count for a registered user. + """ + Return edit count for a registered user. Always returns 0 for 'anonymous' users. @param force: if True, forces reloading the data from API @type force: bool - @return: long + @rtype: int or long """ if 'editcount' in self.getprops(force): return self.getprops()['editcount'] @@ -2883,34 +2963,37 @@ return 0 def isBlocked(self, force=False): - """Determine whether the user is currently blocked. + """ + Determine whether the user is currently blocked. @param force: if True, forces reloading the data from API @type force: bool - @return: bool + @rtype: bool """ return 'blockedby' in self.getprops(force) def isEmailable(self, force=False): - """Determine whether emails may be send to this user through MediaWiki. + """ + Determine whether emails may be send to this user through MediaWiki. @param force: if True, forces reloading the data from API @type force: bool - @return: bool + @rtype: bool """ return 'emailable' in self.getprops(force) def groups(self, force=False): - """Return a list of groups to which this user belongs. + """ + Return a list of groups to which this user belongs. The list of groups may be empty. @param force: if True, forces reloading the data from API @type force: bool - @return: list + @rtype: list """ if 'groups' in self.getprops(force): return self.getprops()['groups'] @@ -2918,7 +3001,8 @@ return [] def getUserPage(self, subpage=u''): - """Return a Page object relative to this user's main page. + """ + Return a Page object relative to this user's main page. @param subpage: subpage part to be appended to the main page title (optional) @@ -2934,7 +3018,8 @@ return Page(Link(self.title() + subpage, self.site)) def getUserTalkPage(self, subpage=u''): - """Return a Page object relative to this user's main talk page. + """ + Return a Page object relative to this user's main talk page. @param subpage: subpage part to be appended to the main talk page title (optional) @@ -2951,7 +3036,8 @@ self.site, defaultNamespace=3)) def send_email(self, subject, text, ccme=False): - """Send an email to this user via MediaWiki's email interface. + """ + Send an email to this user via MediaWiki's email interface. @param subject: the subject header of the mail @type subject: unicode @@ -2989,7 +3075,8 @@ @deprecated('send_email') def sendMail(self, subject, text, ccme=False): - """Send an email to this user via MediaWiki's email interface. + """ + Send an email to this user via MediaWiki's email interface. Outputs 'Email sent' if the email was sent. @@ -3049,7 +3136,8 @@ @deprecated("contributions") @deprecate_arg("limit", "total") # To be consistent with rest of framework def editedPages(self, total=500): - """DEPRECATED. Use contributions(). + """ + DEPRECATED. Use contributions(). Yields pywikibot.Page objects that this user has edited, with an upper bound of 'total'. Pages returned are not @@ -3064,7 +3152,8 @@ @deprecate_arg("limit", "total") # To be consistent with rest of framework @deprecate_arg("namespace", "namespaces") def contributions(self, total=500, namespaces=[]): - """Yield tuples describing this user edits. + """ + Yield tuples describing this user edits. Each tuple is composed of a pywikibot.Page object, the revision id (int), the edit timestamp (as a pywikibot.Timestamp @@ -3087,7 +3176,8 @@ @deprecate_arg("number", "total") def uploadedImages(self, total=10): - """Yield tuples describing files uploaded by this user. + """ + Yield tuples describing files uploaded by this user. Each tuple is composed of a pywikibot.Page, the timestamp (str in ISO8601 format), comment (unicode) and a bool for pageid > 0. @@ -3116,7 +3206,8 @@ """ def __init__(self, site, title=u"", **kwargs): - """Constructor. + """ + Constructor. If title is provided, either ns or entity_type must also be provided, and will be checked against the title parsed using the Page @@ -3283,7 +3374,8 @@ return super(WikibasePage, self).__delattr__(attr) def namespace(self): - """Return the number of the namespace of the entity. + """ + Return the number of the namespace of the entity. @return: Namespace id @rtype: int @@ -3294,7 +3386,7 @@ """ Determine if an entity exists in the data repository. - @return: bool + @rtype: bool """ if not hasattr(self, '_content'): try: @@ -3314,7 +3406,7 @@ template) doesn't apply. @return: True - @rtype: boolean + @rtype: bool """ return True @@ -3416,7 +3508,7 @@ @param diffto: JSON containing claim data @type diffto: dict - @return: dict + @rtype: dict """ data = {} self._diff_to('labels', 'language', 'value', diffto, data) @@ -3492,7 +3584,7 @@ """ Get the revision identifier for the most recent revision of the entity. - @return: long + @rtype: long """ if not hasattr(self, '_revid'): self.get() @@ -3640,7 +3732,8 @@ class ItemPage(WikibasePage): - """Wikibase entity of type 'item'. + """ + Wikibase entity of type 'item'. A Wikibase item may be defined by either a 'Q' id (qid), or by a site & title. @@ -3728,9 +3821,9 @@ @param lazy_load: Do not raise NoPage if either page or corresponding ItemPage does not exist. @type lazy_load: bool - @return: ItemPage + @rtype: ItemPage - @exception NoPage: There is no corresponding ItemPage for the page + @raise NoPage: There is no corresponding ItemPage for the page """ if not page.site.has_transcluded_data: raise pywikibot.WikiBaseError(u'%s has no transcluded data' @@ -3800,7 +3893,7 @@ @param diffto: JSON containing claim data @type diffto: dict - @return: dict + @rtype: dict """ data = super(ItemPage, self).toJSON(diffto=diffto) @@ -3816,6 +3909,7 @@ links to iterate @type family: str|pywikibot.family.Family @return: iterator of pywikibot.Page objects + @rtype: iterator """ if not hasattr(self, 'sitelinks'): self.get() @@ -3837,7 +3931,7 @@ @type site: pywikibot.Site or database name @param force: override caching - @return: unicode + @rtype: unicode """ if force or not hasattr(self, '_content'): self.get(force=force) @@ -3915,7 +4009,6 @@ @param claims: list of claims to be removed @type claims: list or pywikibot.Claim - """ # this check allows single claims to be removed by pushing them into a # list of length one. @@ -4013,7 +4106,7 @@ """ Return the type of this property. - @return: str + @rtype: str """ if not hasattr(self, '_type'): self._type = self.repo.getPropertyType(self) @@ -4092,7 +4185,7 @@ """ Helper function to create a new claim object for this property. - @return: Claim + @rtype: Claim """ return Claim(self.site, self.getID(), datatype=self.type, *args, **kwargs) @@ -4155,7 +4248,7 @@ @param data: JSON containing claim data @type data: dict - @return: Claim + @rtype: Claim """ claim = cls(site, data['mainsnak']['property'], datatype=data['mainsnak'].get('datatype', None)) @@ -4189,7 +4282,7 @@ bit differently, and require some more handling. - @return: dict + @rtype: dict """ source = OrderedDict() @@ -4219,7 +4312,7 @@ differently like references, but I'm not sure if this even requires it's own function. - @return: Claim + @rtype: Claim """ claim = cls.fromJSON(site, {'mainsnak': data, 'hash': data['hash']}) @@ -4324,11 +4417,13 @@ Return the type of snak. @return: str ('value', 'somevalue' or 'novalue') + @rtype: unicode """ return self.snaktype def setSnakType(self, value): - """Set the type of snak. + """ + Set the type of snak. @param value: Type of snak @type value: str ('value', 'somevalue', or 'novalue') @@ -4366,7 +4461,7 @@ """ Return a list of sources, each being a list of Claims. - @return: list + @rtype: list """ return self.sources @@ -4597,7 +4692,6 @@ @type contentmodel: unicode @param sha1: sha1 of revision text (v1.19+) @type sha1: unicode - """ self.revid = revid self.text = text @@ -4619,7 +4713,7 @@ Returns 0 if there is no previous revision @return: id of parent/previous revision - @rtype: long + @rtype: int or long @raises AssertionError: parent id not supplied to the constructor """ if self._parent_id is None: @@ -4681,7 +4775,8 @@ class FileInfo(DotReadableDict): - """A structure holding imageinfo of latest rev. of FilePage. + """ + A structure holding imageinfo of latest rev. of FilePage. All keys of API imageinfo dictionary are mapped to FileInfo attributes. Attributes can be retrieved both as self['key'] or self.key. @@ -4712,7 +4807,8 @@ class Link(ComparableMixin): - """A MediaWiki link (local or interwiki). + """ + A MediaWiki link (local or interwiki). Has the following attributes: @@ -4740,7 +4836,8 @@ ) def __init__(self, text, source=None, defaultNamespace=0): - """Constructor. + """ + Constructor. @param text: the link text (everything appearing between [[ and ]] on a wiki page) @@ -4835,7 +4932,7 @@ @return: The family name and site code for the linked site. If the site is not supported by the configured families it returns None instead of a str. - @rtype: str or None, str or None + @rtype: tuple """ t = self._text fam = self._source.family @@ -4866,7 +4963,8 @@ return (fam.name, code) # text before : doesn't match any known prefix def parse(self): - """Parse wikitext of the link. + """ + Parse wikitext of the link. Called internally when accessing attributes. """ @@ -4985,9 +5083,10 @@ @property def site(self): - """Return the site of the link. + """ + Return the site of the link. - @return: unicode + @rtype: unicode """ if not hasattr(self, "_site"): self.parse() @@ -4995,9 +5094,10 @@ @property def namespace(self): - """Return the namespace of the link. + """ + Return the namespace of the link. - @return: unicode + @rtype: unicode """ if not hasattr(self, "_namespace"): self.parse() @@ -5005,9 +5105,10 @@ @property def title(self): - """Return the title of the link. + """ + Return the title of the link. - @return: unicode + @rtype: unicode """ if not hasattr(self, "_title"): self.parse() @@ -5015,9 +5116,10 @@ @property def section(self): - """Return the section of the link. + """ + Return the section of the link. - @return: unicode + @rtype: unicode """ if not hasattr(self, "_section"): self.parse() @@ -5025,9 +5127,10 @@ @property def anchor(self): - """Return the anchor of the link. + """ + Return the anchor of the link. - @return: unicode + @rtype: unicode """ if not hasattr(self, "_anchor"): self.parse() @@ -5042,15 +5145,14 @@ return self.title def ns_title(self, onsite=None): - """Return full page title, including namespace. + """ + Return full page title, including namespace. @param onsite: site object if specified, present title using onsite local namespace, otherwise use self canonical namespace. - if no corresponding namespace is found in onsite, - pywikibot.Error is raised. - + @raise pywikibot.Error: no corresponding namespace is found in onsite """ ns_id = self.namespace ns = self.site.namespaces[ns_id] @@ -5076,12 +5178,12 @@ return self.title def astext(self, onsite=None): - """Return a text representation of the link. + """ + Return a text representation of the link. @param onsite: if specified, present as a (possibly interwiki) link from the given site; otherwise, present as an internal link on the source site. - """ if onsite is None: onsite = self._source @@ -5124,9 +5226,10 @@ return (self.site, self.namespace, self.title) def __unicode__(self): - """Return a unicode string representation. + """ + Return a unicode string representation. - @return: unicode + @rtype: unicode """ return self.astext() @@ -5146,7 +5249,7 @@ @param source: Link from site source @param source: Site - @return: Link + @rtype: Link """ link = cls.__new__(cls) link._site = page.site @@ -5174,7 +5277,7 @@ @param source: Link from site source @param source: Site - @return: Link + @rtype: Link """ link = cls.__new__(cls) if source.family.interwiki_forward: @@ -5238,12 +5341,13 @@ def html2unicode(text, ignore=None): - """Replace HTML entities with equivalent unicode. + """ + Replace HTML entities with equivalent unicode. @param ignore: HTML entities to ignore @param ignore: list of int - @return: unicode + @rtype: unicode """ if ignore is None: ignore = [] @@ -5339,7 +5443,7 @@ @param encoding: Encoding to use @type encoding: str - @return: str + @rtype: str """ try: x.encode(encoding) @@ -5359,9 +5463,9 @@ @type title: str @param encodings: Encodings to attempt to use during conversion. @type encodings: str, list or Site - @return: unicode + @rtype: unicode - @exception UnicodeError: Could not convert using any encoding. + @raise UnicodeError: Could not convert using any encoding. """ if isinstance(encodings, basestring): encodings = [encodings] diff --git a/pywikibot/site.py b/pywikibot/site.py index 810ab10..6ca5ee7 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -6,7 +6,7 @@ groups of wikis on the same topic in different languages. """ # -# (C) Pywikibot team, 2008-2015 +# (C) Pywikibot team, 2008-2016 # # Distributed under the terms of the MIT license. # @@ -94,7 +94,8 @@ class LoginStatus(object): - """Enum for Login statuses. + """ + Enum for Login statuses. >>> LoginStatus.NOT_ATTEMPTED -3 @@ -137,7 +138,8 @@ class Namespace(Iterable, ComparableMixin, UnicodeMixin): - """Namespace site data object. + """ + Namespace site data object. This is backwards compatible with the structure of entries in site._namespaces which were a list of:: @@ -416,7 +418,8 @@ @staticmethod def normalize_name(name): - """Remove an optional colon before and after name. + """ + Remove an optional colon before and after name. TODO: reject illegal characters. """ @@ -441,14 +444,15 @@ @classmethod @deprecated('NamespacesDict.lookup_name') def lookup_name(cls, name, namespaces=None): - """Find the Namespace for a name. + """ + Find the Namespace for a name. @param name: Name of the namespace. @type name: basestring @param namespaces: namespaces to search default: builtins only @type namespaces: dict of Namespace - @return: Namespace or None + @rtype: Namespace or None """ if not namespaces: namespaces = cls.builtin_namespaces() @@ -472,6 +476,7 @@ @type namespaces: dict of Namespace @return: list of Namespace objects in the same order as the identifiers + @rtype: list @raises KeyError: a namespace identifier was not resolved @raises TypeError: a namespace identifier has an inappropriate type such as NoneType or bool @@ -552,7 +557,7 @@ @param name: Name of the namespace. @type name: basestring - @return: Namespace or None + @rtype: Namespace or None """ name = Namespace.normalize_name(name) if name is False: @@ -567,7 +572,7 @@ @param name: Name of the namespace. @type name: basestring - @return: Namespace or None + @rtype: Namespace or None """ return self._namespace_names.get(name) @@ -598,6 +603,7 @@ or a single instance of those types @return: list of Namespace objects in the same order as the identifiers + @rtype: list @raises KeyError: a namespace identifier was not resolved @raises TypeError: a namespace identifier has an inappropriate type such as NoneType or bool @@ -717,7 +723,6 @@ @type user: str @param sysop: sysop account user name (optional) @type sysop: str - """ if code.lower() != code: # Note the Site function in __init__ also emits a UserWarning @@ -799,11 +804,11 @@ @property def code(self): - """The identifying code for this Site. + """ + The identifying code for this Site. By convention, this is usually an ISO language code, but it does not have to be. - """ return self.__code @@ -812,16 +817,15 @@ """The ISO language code for this Site. Presumed to be equal to the wiki prefix, but this can be overridden. - """ return self.__code @property def doc_subpage(self): - """Return the documentation subpage for this Site. + """ + Return the documentation subpage for this Site. - @return: tuple - + @rtype: tuple """ if not hasattr(self, '_doc_subpage'): try: @@ -1005,7 +1009,8 @@ return self._namespaces def ns_normalize(self, value): - """Return canonical local form of namespace name. + """ + Return canonical local form of namespace name. @param value: A namespace name @type value: unicode @@ -1035,7 +1040,8 @@ return [u"PAGENAMEE"] def lock_page(self, page, block=True): - """Lock page for writing. Must be called before writing any page. + """ + Lock page for writing. Must be called before writing any page. We don't want different threads trying to write to the same page at the same time, even to different sections. @@ -1057,7 +1063,8 @@ self._pagemutex.release() def unlock_page(self, page): - """Unlock page. Call as soon as a write operation has completed. + """ + Unlock page. Call as soon as a write operation has completed. @param page: the page to be locked @type page: pywikibot.Page @@ -1088,7 +1095,7 @@ @param othersite: Generate a interwiki link for use on this site. @type othersite: Site (optional) - @return: unicode + @rtype: unicode """ return pywikibot.Link(title, self).astext(othersite) @@ -1811,10 +1818,10 @@ class APISite(BaseSite): - """API interface to MediaWiki site. + """ + API interface to MediaWiki site. Do not instantiate directly; use pywikibot.Site function. - """ def __init__(self, code, fam=None, user=None, sysop=None): @@ -1961,7 +1968,7 @@ instead of the normal user. @type sysop: bool - @return: bool + @rtype: bool """ if not hasattr(self, "_userinfo"): return False @@ -1987,7 +1994,7 @@ instead of the normal user. @type sysop: bool - @return: bool + @rtype: bool """ return self.logged_in(sysop) and self.user() @@ -2134,7 +2141,6 @@ - groups: list of groups (could be empty) - rights: list of rights (could be empty) - editcount: global editcount - """ if not hasattr(self, "_globaluserinfo"): uirequest = self._simple_request( @@ -2310,7 +2316,7 @@ @param keys: MediaWiki messages to fetch @type keys: set of str, '*' or ['*'] - @return: dict + @rtype dict """ if keys == '*' or keys == ['*']: issue_deprecation_warning('mediawiki_messages("*")', @@ -2346,7 +2352,7 @@ @param key: name of MediaWiki message @type key: str - @return: unicode + @rtype unicode """ return self.mediawiki_messages([key])[key] @@ -2356,7 +2362,7 @@ @param key: name of MediaWiki message @type key: str - @return: bool + @rtype: bool """ return self.has_all_mediawiki_messages([key]) @@ -2366,7 +2372,7 @@ @param keys: names of MediaWiki messages @type keys: set of str - @return: bool + @rtype: bool """ try: self.mediawiki_messages(keys) @@ -2382,6 +2388,7 @@ be in the original site language. @return: list of tuples (month name, abbreviation) + @rtype: list """ if hasattr(self, "_months_names"): return self._months_names @@ -2412,7 +2419,7 @@ @param args: text to be expanded @type args: iterable of unicode - @return: unicode + @rtype: unicode """ NEEDED_MW_MESSAGES = ('and', 'comma-separator', 'word-separator') if not args: @@ -2454,8 +2461,7 @@ @type title: unicode @param includecomments: if True do not strip comments @type includecomments: bool - @return: unicode - + @rtype: unicode """ if not isinstance(text, basestring): raise ValueError('text must be a string') @@ -2773,7 +2779,6 @@ @return: A tuple containing _proofread_index_ns, self._proofread_page_ns and self._proofread_levels. @rtype: Namespace, Namespace, dict - """ if (not hasattr(self, '_proofread_index_ns') or not hasattr(self, '_proofread_page_ns') or @@ -2825,7 +2830,6 @@ If optional argument 'all' is true, return a list of all recognized values for this namespace. - """ if all: return self.namespaces[num] @@ -2901,7 +2905,6 @@ """Load image info from api and save in page attributes. @param history: if true, return the image's version history - """ title = page.title(withSection=False) args = {"titles": title} @@ -2971,7 +2974,7 @@ - page is unprotected, and bot has an account for this site, or - page is protected, and bot has a sysop account for this site. - @return: bool + @rtype: bool """ rest = self.page_restrictions(page) sysop_protected = "edit" in rest and rest['edit'][0] == 'sysop' @@ -3148,7 +3151,6 @@ """Validate if requested tokens are acceptable. Valid tokens depend on mw version. - """ _version = MediaWikiVersion(self.version()) if _version < MediaWikiVersion('1.20'): @@ -3212,7 +3214,7 @@ @type all: bool return: a dict with retrieved valid tokens. - + rtype: dict """ def warn_handler(mod, text): """Filter warnings for not available tokens.""" @@ -3298,7 +3300,6 @@ @param page: the Page for which a token should be retrieved @param tokentype: the type of token (e.g., "edit", "move", "delete"); see API documentation for full list of types - """ return self.tokens[tokentype] @@ -3494,7 +3495,6 @@ @param content: if True, load the current content of each iterated page (default False); note that this means the contents of the category description page, not the pages contained in the category - """ clargs = {} if hasattr(page, "_pageid"): @@ -3721,7 +3721,6 @@ @param excludeuser: retrieve all revisions not authored by this user @param sysop: if True, switch to sysop account (if available) to retrieve this page - """ latest = (revids is None and startid is None and @@ -3829,7 +3828,6 @@ @param include_obsolete: if true, yield even Link objects whose site is obsolete - """ lltitle = page.title(withSection=False) llquery = self._generator(api.PropertyGenerator, @@ -3963,7 +3961,6 @@ """Yield all pages with a given prefix. Deprecated. Use allpages() with the prefix= parameter instead of this method. - """ return self.allpages(prefix=prefix, namespace=namespace, filterredir=includeredirects) @@ -4019,7 +4016,6 @@ @param content: if True, load the current content of each iterated page (default False); note that this means the contents of the category description page, not the pages that are members of the category - """ acgen = self._generator(api.PageGenerator, type_arg="allcategories", gacfrom=start, @@ -4051,7 +4047,6 @@ the user is a member of at least 1 group, and will be a list of unicodes; all the other values are unicodes and should always be present. - """ if not hasattr(self, "_bots"): self._bots = {} @@ -4077,7 +4072,6 @@ @param prefix: only iterate usernames starting with this substring @param group: only iterate users that are members of this group @type group: str - """ augen = self._generator(api.ListGenerator, type_arg="allusers", auprop="editcount|groups|registration", @@ -4106,7 +4100,6 @@ @param content: if True, load the current content of each iterated page (default False); note that this means the content of the image description page, not the image itself - """ aigen = self._generator(api.PageGenerator, type_arg="allimages", gaifrom=start, @@ -4139,7 +4132,6 @@ @param reverse: if True, iterate oldest blocks first (default: newest) @param blockids: only iterate blocks with these id numbers @param users: only iterate blocks affecting these usernames or IPs - """ if starttime and endtime: if reverse: @@ -4560,7 +4552,6 @@ @param reverse: Iterate oldest revisions first (default: newest) @param get_text: If True, retrieve the content of each revision and an undelete token - """ if start and end: self.assert_valid_iter_params('deletedrevs', start, end, reverse) @@ -4609,7 +4600,6 @@ @param usernames: a list of user names @type usernames: list, or other iterable, of unicodes - """ if not isinstance(usernames, basestring): usernames = u"|".join(usernames) @@ -4625,7 +4615,7 @@ DEPRECATED. @param redirect: Return a random redirect page - @return: pywikibot.Page + @rtype: pywikibot.Page """ return self.randompages(total=1, redirects=redirect) @@ -4731,6 +4721,7 @@ @kwarg undo: Revision id to undo. Overrides Page.text @type undo: int @return: True if edit succeeded, False if it failed + @rtype: bool @raises Error: No text to be saved @raises NoPage: recreate is disabled and page does not exist """ @@ -4924,7 +4915,7 @@ @param noredirect: if True, suppress creation of a redirect from the old title to the new one @return: Page object with the new title - + @rtype: pywikibot.Page """ oldtitle = page.title(withSection=False) newlink = pywikibot.Link(newtitle, self) @@ -5427,7 +5418,8 @@ @must_be(group='user') @deprecated('Site().watch') def watchpage(self, page, unwatch=False): - """Add or remove page from watchlist. + """ + Add or remove page from watchlist. DEPRECATED: Use Site().watch() instead. @@ -5452,11 +5444,12 @@ @must_be(group='user') def purgepages(self, pages, **kwargs): - """Purge the server's cache for one or multiple pages. + """ + Purge the server's cache for one or multiple pages. @param pages: list of Page objects @return: True if API returned expected response; False otherwise - + @rtype: bool """ req = self._simple_request(action='purge', titles=[page for page in set(pages)]) @@ -5562,7 +5555,8 @@ comment=None, text=None, watch=False, ignore_warnings=False, chunk_size=0, _file_key=None, _offset=0, _verify_stash=None, report_success=None): - """Upload a file to the wiki. + """ + Upload a file to the wiki. Either source_filename or source_url, but not both, must be provided. @@ -6286,7 +6280,8 @@ @need_version("1.18") def compare(self, old, diff): - """Corresponding method to the 'action=compare' API action. + """ + Corresponding method to the 'action=compare' API action. See: https://en.wikipedia.org/w/api.php?action=help&modules=compare Use pywikibot.diff's html_comparator() method to parse result. @@ -6329,7 +6324,8 @@ # Flow API calls @need_extension('Flow') def load_board(self, page): - """Retrieve the data for a Flow board. + """ + Retrieve the data for a Flow board. @param page: A Flow board @type page: Board @@ -6346,7 +6342,8 @@ def load_topiclist(self, page, format='wikitext', limit=100, sortby='newest', toconly=False, offset=None, offset_id=None, reverse=False, include_offset=False): - """Retrieve the topiclist of a Flow board. + """ + Retrieve the topiclist of a Flow board. @param page: A Flow board @type page: Board @@ -6384,7 +6381,8 @@ @need_extension('Flow') def load_topic(self, page, format): - """Retrieve the data for a Flow topic. + """ + Retrieve the data for a Flow topic. @param page: A Flow topic @type page: Topic @@ -6401,7 +6399,8 @@ @need_extension('Flow') def load_post_current_revision(self, page, post_id, format): - """Retrieve the data for a post to a Flow topic. + """ + Retrieve the data for a post to a Flow topic. @param page: A Flow topic @type page: Topic @@ -6421,7 +6420,8 @@ @must_be('user') @need_extension('Flow') def create_new_topic(self, page, title, content, format): - """Create a new topic on a Flow board. + """ + Create a new topic on a Flow board. @param page: A Flow board @type page: Board @@ -6469,7 +6469,8 @@ @must_be('user', 'flow-lock') @need_extension('Flow') def lock_topic(self, page, lock, reason): - """Lock or unlock a Flow topic. + """ + Lock or unlock a Flow topic. @param page: A Flow topic @type page: Topic @@ -6492,7 +6493,8 @@ @must_be('user') @need_extension('Flow') def moderate_topic(self, page, state, reason): - """Moderate a Flow topic. + """ + Moderate a Flow topic. @param page: A Flow topic @type page: Topic @@ -6514,7 +6516,8 @@ @must_be('user', 'flow-delete') @need_extension('Flow') def delete_topic(self, page, reason): - """Delete a Flow topic. + """ + Delete a Flow topic. @param page: A Flow topic @type page: Topic @@ -6528,7 +6531,8 @@ @must_be('user', 'flow-hide') @need_extension('Flow') def hide_topic(self, page, reason): - """Hide a Flow topic. + """ + Hide a Flow topic. @param page: A Flow topic @type page: Topic @@ -6542,7 +6546,8 @@ @must_be('user', 'flow-suppress') @need_extension('Flow') def suppress_topic(self, page, reason): - """Suppress a Flow topic. + """ + Suppress a Flow topic. @param page: A Flow topic @type page: Topic @@ -6556,7 +6561,8 @@ @must_be('user') @need_extension('Flow') def restore_topic(self, page, reason): - """Restore a Flow topic. + """ + Restore a Flow topic. @param page: A Flow topic @type page: Topic @@ -6570,7 +6576,8 @@ @must_be('user') @need_extension('Flow') def moderate_post(self, post, state, reason): - """Moderate a Flow post. + """ + Moderate a Flow post. @param post: A Flow post @type post: Post @@ -6594,7 +6601,8 @@ @must_be('user', 'flow-delete') @need_extension('Flow') def delete_post(self, post, reason): - """Delete a Flow post. + """ + Delete a Flow post. @param post: A Flow post @type post: Post @@ -6608,7 +6616,8 @@ @must_be('user', 'flow-hide') @need_extension('Flow') def hide_post(self, post, reason): - """Hide a Flow post. + """ + Hide a Flow post. @param post: A Flow post @type post: Post @@ -6622,7 +6631,8 @@ @must_be('user', 'flow-suppress') @need_extension('Flow') def suppress_post(self, post, reason): - """Suppress a Flow post. + """ + Suppress a Flow post. @param post: A Flow post @type post: Post @@ -6636,7 +6646,8 @@ @must_be('user') @need_extension('Flow') def restore_post(self, post, reason): - """Restore a Flow post. + """ + Restore a Flow post. @param post: A Flow post @type post: Post @@ -6757,7 +6768,8 @@ return baserevid def __getattr__(self, attr): - """Provide data access methods. + """ + Provide data access methods. Methods provided are get_info, get_sitelinks, get_aliases, get_labels, get_descriptions, and get_urls. @@ -6852,7 +6864,8 @@ return data['entities'] def preloaditempages(self, pagelist, groupsize=50): - """Yield ItemPages with content prefilled. + """ + Yield ItemPages with content prefilled. Note that pages will be iterated in a different order than in the underlying pagelist. @@ -7266,6 +7279,7 @@ @param bot: Whether to mark the edit as a bot edit @type bot: bool @return: dict API output + @rtype: dict """ params = { 'action': 'wblinktitles', @@ -7297,6 +7311,7 @@ @param summary: Edit summary @type summary: str @return: dict API output + @rtype: dict """ params = { 'action': 'wbmergeitems', @@ -7341,6 +7356,7 @@ @param bot: Whether to mark the edit as a bot edit @type bot: bool @return: pywikibot.ItemPage of newly created item + @rtype: pywikibot.ItemPage """ sitelinks = { page.site.dbName(): { @@ -7382,6 +7398,7 @@ case of no limit. @type limit: int or None @return: 'search' list from API output. + @rtype: api.APIGenerator """ lang_codes = [lang['code'] for lang in self._siteinfo.get('languages')] if language not in lang_codes: -- To view, visit https://gerrit.wikimedia.org/r/263179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3f15785417c94c1a9ffc8ef43579db13d615193c Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core 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

[Gerrit] Implement support for monolingual text values - change (pywikibot/core)
by jenkins-bot (Code Review) 17 Jan '16

17 Jan '16

jenkins-bot has submitted this change and it was merged. Change subject: Implement support for monolingual text values ...................................................................... Implement support for monolingual text values Bug: T85385 Change-Id: Ide81dafa520dfd52629d17f919c7ccc40335bea2 --- M pywikibot/__init__.py M pywikibot/page.py 2 files changed, 41 insertions(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved Multichill: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 114c204..609d4f8 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -540,6 +540,43 @@ return cls(amount, wb['unit'], error) +class WbMonolingualText(_WbRepresentation): + """A Wikibase monolingual text representation.""" + + def __init__(self, text, language): + """ + Create a new WbMonolingualText object. + + @param text: text string + @type text: str + @param language: language code of the string + @type language: str + """ + self.text = text + self.language = language + + def toWikibase(self): + """ + Convert the data to a JSON object for the Wikibase API. + + @return: Wikibase JSON + @rtype: dict + """ + json = {'text': self.text, + 'language': self.language + } + return json + + @classmethod + def fromWikibase(cls, wb): + """ + Create a WbMonolingualText from the JSON data given by the Wikibase API. + + @param wb: Wikibase JSON + @type wb: dict + """ + return cls(wb['text'], wb['language']) + _sites = {} _url_cache = {} # The code/fam pair for each URL diff --git a/pywikibot/page.py b/pywikibot/page.py index a532664..cbaeb49 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -4114,6 +4114,8 @@ 'globe-coordinate': pywikibot.Coordinate.fromWikibase, 'time': lambda value, site: pywikibot.WbTime.fromWikibase(value), 'quantity': lambda value, site: pywikibot.WbQuantity.fromWikibase(value), + 'monolingualtext': lambda value, site: + pywikibot.WbMonolingualText.fromWikibase(value) } SNAK_TYPES = ('value', 'somevalue', 'novalue') @@ -4532,7 +4534,8 @@ value = self.getTarget() elif self.type == 'commonsMedia': value = self.getTarget().title(withNamespace=False) - elif self.type in ('globe-coordinate', 'time', 'quantity'): + elif self.type in ('globe-coordinate', 'time', + 'quantity', 'monolingualtext'): value = self.getTarget().toWikibase() else: raise NotImplementedError('%s datatype is not supported yet.' -- To view, visit https://gerrit.wikimedia.org/r/232406 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ide81dafa520dfd52629d17f919c7ccc40335bea2 Gerrit-PatchSet: 15 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Smalyshev <smalyshev(a)wikimedia.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Lokal Profil <lokal.profil(a)gmail.com> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Smalyshev <smalyshev(a)wikimedia.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Errored: wikimedia/pywikibot-core#3184 (master - 9b93329)
by Travis CI 14 Jan '16

14 Jan '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3184 Status: Errored Duration: 1 hour, 13 minutes, and 55 seconds Commit: 9b93329 (master) Author: jenkins-bot Message: Merge "Enable doctest syntax checking" View the changeset: https://github.com/wikimedia/pywikibot-core/compare/a8539a78ff65...9b933290… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/102291702 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Enable doctest syntax checking - change (pywikibot/core)
by jenkins-bot (Code Review) 14 Jan '16

14 Jan '16

jenkins-bot has submitted this change and it was merged. Change subject: Enable doctest syntax checking ...................................................................... Enable doctest syntax checking doctest syntax checking should be enabled on all files. Also disable running doctest in default jenkins nose testenv, so that more doctest using network resources may be added to improve the usefulness of the documentation. Change-Id: I6ab8e37dca2d35bae8937fd2555bf6e2548315ca --- M tox.ini 1 file changed, 20 insertions(+), 6 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/tox.ini b/tox.ini index a24e41d..358ffe2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 1.6 skipsdist = True -envlist = flake8,flake8-py3,py26,py27,py34 +envlist = flake8,flake8-py3,doctest-{py27,py34},py26,py27,py34 [tox:jenkins] # Override default for WM Jenkins @@ -9,7 +9,7 @@ envlist = flake8,flake8-py3 [params] -nose_skip = --ignore-files=(gui\.py|botirc\.py|rcstream\.py|api\.py) +doctest_skip = --ignore-files=(gui\.py|botirc\.py|rcstream\.py) [testenv] setenv = @@ -25,9 +25,10 @@ [testenv:flake8] commands = flake8 --version - flake8 --ignore={[flake8]ignore} {posargs} + flake8 --doctests {posargs} basepython = python2.7 deps = flake8 + git+https://github.com/pyflakes/pyflakes.git hacking flake8-docstrings<0.2.2 flake8-putty @@ -39,9 +40,10 @@ [testenv:flake8-py3] commands = flake8 --version - flake8 --ignore={[flake8]ignore} {posargs} + flake8 --doctests {posargs} basepython = python3 deps = flake8 + git+https://github.com/pyflakes/pyflakes.git flake8-docstrings<0.2.2 flake8-putty @@ -49,7 +51,7 @@ commands = python -W error::UserWarning -m generate_user_files -family:test -lang:test -v nosetests --version - nosetests --with-doctest --with-detecthttp -v -a '!net' tests pywikibot {[params]nose_skip} + nosetests --with-detecthttp -v -a '!net' tests deps = nose nose-detecthttp @@ -60,12 +62,24 @@ commands = python -W error::UserWarning -m generate_user_files -family:test -lang:test -v nosetests --version - nosetests --with-doctest --with-detecthttp -v -a '!net' tests pywikibot {[params]nose_skip} + nosetests --with-detecthttp -v -a '!net' tests deps = nose nose-detecthttp>=0.1.3 # Python 3 support added six +[testenv:doctest] +commands = + python -W error::UserWarning -m generate_user_files -family:test -lang:test -v + nosetests --version + nosetests --with-doctest pywikibot {[params]doctest_skip} +basepython = + py27: python2.7 + py34: python3.4 +deps = + nose + six + [testenv:venv] commands = {posargs} -- To view, visit https://gerrit.wikimedia.org/r/256212 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6ab8e37dca2d35bae8937fd2555bf6e2548315ca Gerrit-PatchSet: 4 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: jenkins-bot <>

1 0

Errored: wikimedia/pywikibot-core#3183 (master - a8539a7)
by Travis CI 13 Jan '16

13 Jan '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3183 Status: Errored Duration: 1 hour, 16 minutes, and 30 seconds Commit: a8539a7 (master) Author: Andrew Harris Message: Simplify generate_user_files.py options Some of the questions in generage_user_files.py can be safetly removed in order to simplify the process. Remove some questions from the script to make user file generation easier. Also remove user-fixes.py creation and instead provide a sample file. Bug: T85270 Change-Id: I358624020a58a4829c2f2ba08448193f87c55ff5 View the changeset: https://github.com/wikimedia/pywikibot-core/compare/cc4ef1453f0d...a8539a78… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/101998696 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

Errored: wikimedia/pywikibot-core#3182 (master - cc4ef14)
by Travis CI 13 Jan '16

13 Jan '16

Build Update for wikimedia/pywikibot-core ------------------------------------- Build: #3182 Status: Errored Duration: 1 hour, 13 minutes, and 5 seconds Commit: cc4ef14 (master) Author: John Vandenberg Message: Add noqa support to pep8 E731 pep8 1.6.0+ includes E731 for assigned lambda's, but it does not support 'noqa' for this code. flake8-putty allows specific codes to be whitelisted in specific files and when a regex condition has been met. Change-Id: If8a22d57f4b2b22695314810825b80c7b581a07b View the changeset: https://github.com/wikimedia/pywikibot-core/compare/11d2008f6a6d...cc4ef145… View the full build log and details: https://travis-ci.org/wikimedia/pywikibot-core/builds/101994143 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

[Gerrit] Simplify generate_user_files.py options - change (pywikibot/core)
by jenkins-bot (Code Review) 13 Jan '16

13 Jan '16

jenkins-bot has submitted this change and it was merged. Change subject: Simplify generate_user_files.py options ...................................................................... Simplify generate_user_files.py options Some of the questions in generage_user_files.py can be safetly removed in order to simplify the process. Remove some questions from the script to make user file generation easier. Also remove user-fixes.py creation and instead provide a sample file. Bug: T85270 Change-Id: I358624020a58a4829c2f2ba08448193f87c55ff5 --- M generate_user_files.py A user-fixes.py.sample 2 files changed, 71 insertions(+), 124 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/generate_user_files.py b/generate_user_files.py index 4455862..7085816 100755 --- a/generate_user_files.py +++ b/generate_user_files.py @@ -1,6 +1,6 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -"""Script to create user files (user-config.py, user-fixes.py).""" +"""Script to create user-config.py.""" # # (C) Pywikibot team, 2010-2015 # @@ -12,7 +12,6 @@ import codecs import os import re -import shutil import sys from textwrap import wrap @@ -246,50 +245,45 @@ config_text = '' config_content = SMALL_CONFIG - if ((force and not config.verbose_output) or - pywikibot.input_yn('Would you like the extended version of ' - 'user-config.py, with explanations ' - 'included?', automatic_quit=False, - default=True, force=force)): - try: - # config2.py will be in the pywikibot/ directory relative to this - # script (generate_user_files) - install = os.path.dirname(os.path.abspath(__file__)) - with codecs.open(os.path.join(install, "pywikibot", "config2.py"), - "r", "utf-8") as config_f: - config_file = config_f.read() + try: + # config2.py will be in the pywikibot/ directory relative to this + # script (generate_user_files) + install = os.path.dirname(os.path.abspath(__file__)) + with codecs.open(os.path.join(install, "pywikibot", "config2.py"), + "r", "utf-8") as config_f: + config_file = config_f.read() - res = re.findall("^(# ############# (?:" - "LOGFILE|" - "INTERWIKI|" - "SOLVE_DISAMBIGUATION|" - "IMAGE RELATED|" - "TABLE CONVERSION BOT|" - "WEBLINK CHECKER|" - "DATABASE|" - "SEARCH ENGINE|" - "COPYRIGHT|" - "FURTHER" - ") SETTINGS .*)^(?=#####|# =====)", - config_file, re.MULTILINE | re.DOTALL) + res = re.findall("^(# ############# (?:" + "LOGFILE|" + "INTERWIKI|" + "SOLVE_DISAMBIGUATION|" + "IMAGE RELATED|" + "TABLE CONVERSION BOT|" + "WEBLINK CHECKER|" + "DATABASE|" + "SEARCH ENGINE|" + "COPYRIGHT|" + "FURTHER" + ") SETTINGS .*)^(?=#####|# =====)", + config_file, re.MULTILINE | re.DOTALL) - if not res: - warn('Extended config extraction failed', UserWarning) + if not res: + warn('Extended config extraction failed', UserWarning) - config_text = '\n'.join(res) - if len(config_text.splitlines()) < 350: - warn('Extended config extraction too short: %d' - % len(config_text.splitlines()), - UserWarning) + config_text = '\n'.join(res) + if len(config_text.splitlines()) < 350: + warn('Extended config extraction too short: %d' + % len(config_text.splitlines()), + UserWarning) - config_content = EXTENDED_CONFIG - except Exception as e: - # If the warning was explicitly enabled, raise - if isinstance(e, UserWarning): - raise - pywikibot.output('Exception while creating extended user-config; ' - 'falling back to simple user-config.') - pywikibot.exception() + config_content = EXTENDED_CONFIG + except Exception as e: + # If the warning was explicitly enabled, raise + if isinstance(e, UserWarning): + raise + pywikibot.output('Exception while creating extended user-config; ' + 'falling back to simple user-config.') + pywikibot.exception() try: with codecs.open(_fnc, "w", "utf-8") as f: @@ -305,31 +299,6 @@ except: pass raise - - -def create_user_fixes(): - """Create a basic user-fixes.py in base_dir.""" - _fnf = os.path.join(base_dir, "user-fixes.py") - if not file_exists(_fnf): - with codecs.open(_fnf, "w", "utf-8") as f: - f.write(r"""# -*- coding: utf-8 -*- - -# -# This is only an example. Don't use it. -# - -fixes['example'] = { - 'regex': True, - 'msg': { - '_default': u'no summary specified', - }, - 'replacements': [ - (r'\bword\b', u'two words'), - ] -} - -""") - pywikibot.output(u"'%s' written." % _fnf) def main(*args): @@ -349,6 +318,8 @@ # and 'force' mode can be activated below. (config.family, config.mylang) = ('wikipedia', None) + pywikibot.output('You can abort at any time by pressing ctrl-c') + local_args = pywikibot.handle_args(args) if local_args: pywikibot.output('Unknown arguments: %s' % ' '.join(local_args)) @@ -365,67 +336,27 @@ username = config.usernames[config.family].get(config.mylang) args = (config.family, config.mylang, username) - while not force or config.verbose_output: + # Only give option for directory change if user-config.py already exists + # in the directory. This will repeat if user-config.py also exists in + # the requested directory. + if not force or config.verbose_output: pywikibot.output(u'\nYour default user directory is "%s"' % base_dir) - if pywikibot.input_yn("Do you want to use that directory?", - default=True, automatic_quit=False, - force=force): - break - else: - new_base = change_base_dir() - if new_base: - base_dir = new_base + while os.path.isfile(os.path.join(base_dir, "user-config.py")): + pywikibot.output('user-config.py already exists' + ' in the target directory.') + if pywikibot.input_yn('Would you like to change the directory?', + default=True, + automatic_quit=False, force=force): + new_base = change_base_dir() + if new_base: + base_dir = new_base + else: break - copied_config = False - copied_fixes = False - while not force or config.verbose_output: - if os.path.exists(os.path.join(base_dir, "user-config.py")): - break - if pywikibot.input_yn( - "Do you want to copy user files from an existing Pywikibot " - "installation?", - default=False, force=force, - automatic_quit=False): - oldpath = pywikibot.input("Path to existing user-config.py?") - if not os.path.exists(oldpath): - pywikibot.error("Not a valid path") - continue - if os.path.isfile(oldpath): - # User probably typed /user-config.py at the end, so strip it - oldpath = os.path.dirname(oldpath) - if not os.path.isfile(os.path.join(oldpath, "user-config.py")): - pywikibot.error("No user_config.py found in that directory") - continue - shutil.copyfile(os.path.join(oldpath, "user-config.py"), - os.path.join(base_dir, "user-config.py")) - copied_config = True - - if os.path.isfile(os.path.join(oldpath, "user-fixes.py")): - shutil.copyfile(os.path.join(oldpath, "user-fixes.py"), - os.path.join(base_dir, "user-fixes.py")) - copied_fixes = True - - else: - break + # user-fixes.py also used to be created here, but has + # been replaced by an example file. if not os.path.isfile(os.path.join(base_dir, "user-config.py")): - if ((force and not config.verbose_output) or - pywikibot.input_yn('Create user-config.py file? Required for ' - 'running bots.', - default=True, automatic_quit=False, - force=force)): - create_user_config(args, force=force) - elif not copied_config: - pywikibot.output("user-config.py already exists in the directory") - if not os.path.isfile(os.path.join(base_dir, "user-fixes.py")): - if ((force and not config.verbose_output) or - pywikibot.input_yn('Create user-fixes.py file? Optional and ' - 'for advanced users.', - force=force, - default=False, automatic_quit=False)): - create_user_fixes() - elif not copied_fixes: - pywikibot.output("user-fixes.py already exists in the directory") + create_user_config(args, force=force) if __name__ == '__main__': main() diff --git a/user-fixes.py.sample b/user-fixes.py.sample new file mode 100644 index 0000000..71d9e35 --- /dev/null +++ b/user-fixes.py.sample @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- + +# +# This is only an example. Don't use it. +# + +fixes['example'] = { + 'regex': True, + 'msg': { + '_default': u'no summary specified', + }, + 'replacements': [ + (r'\bword\b', u'two words'), + ] +} + -- To view, visit https://gerrit.wikimedia.org/r/263233 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I358624020a58a4829c2f2ba08448193f87c55ff5 Gerrit-PatchSet: 7 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: AndyTechGuy <andytechdude(a)gmail.com> Gerrit-Reviewer: 8ohit.dua <8ohit.dua(a)gmail.com> Gerrit-Reviewer: AndyTechGuy <andytechdude(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Add noqa support to pep8 E731 - change (pywikibot/core)
by jenkins-bot (Code Review) 13 Jan '16

13 Jan '16

jenkins-bot has submitted this change and it was merged. Change subject: Add noqa support to pep8 E731 ...................................................................... Add noqa support to pep8 E731 pep8 1.6.0+ includes E731 for assigned lambda's, but it does not support 'noqa' for this code. flake8-putty allows specific codes to be whitelisted in specific files and when a regex condition has been met. Change-Id: If8a22d57f4b2b22695314810825b80c7b581a07b --- M pwb.py M tox.ini 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index fdd6fd4..834620b 100755 --- a/pwb.py +++ b/pwb.py @@ -77,7 +77,7 @@ except RuntimeError: remove_modules() - pwb = lambda: None + pwb = lambda: None # noqa: E731 pwb.argvu = [] diff --git a/tox.ini b/tox.ini index bd09641..1de1ab7 100644 --- a/tox.ini +++ b/tox.ini @@ -102,6 +102,7 @@ accept-encodings = utf-8 require-code = true putty-ignore = + pwb.py,scripts/interwiki.py,scripts/flickrripper.py,pywikibot/site.py, /# noqa: E731/ : +E731 generate_family_file.py : +D102,T001 pwb.py : +T001 pywikibot/cosmetic_changes.py : +D102, D103 -- To view, visit https://gerrit.wikimedia.org/r/263662 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If8a22d57f4b2b22695314810825b80c7b581a07b Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: AndyTechGuy <andytechdude(a)gmail.com> Gerrit-Reviewer: Hashar <hashar(a)free.fr> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Samtar <samtarling6(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2016