Pywikibot-commits August 2013

pywikibot-commits@lists.wikimedia.org

1 participants
172 discussions

[Gerrit] Adding missing wikisource namespace per [1] and [2] - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Adding missing wikisource namespace per [1] and [2] ...................................................................... Adding missing wikisource namespace per [1] and [2] [1]: http://lists.wikimedia.org/pipermail/pywikipedia-l/2013-August/008241.html [2]: http://en.wikisource.org/w/index.php?namespace=114&tagfilter=&title=Special… Change-Id: I8c48b96e0bfe616569aae593300d2baf425d925e --- M families/wikisource_family.py 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/families/wikisource_family.py b/families/wikisource_family.py index 332188c..c9bbf8b 100644 --- a/families/wikisource_family.py +++ b/families/wikisource_family.py @@ -549,6 +549,12 @@ 'fr': u'Discussion Livre', 'he': u'שיחת מפתח', } + self.namespaces[114] = { + 'en': u'Translation', + } + self.namespaces[115] = { + 'en': u'Translation talk', + } self.namespaces[250] = { 'az': u'Page', -- To view, visit https://gerrit.wikimedia.org/r/81494 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8c48b96e0bfe616569aae593300d2baf425d925e Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] Update gitmodules for auto-update - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Update gitmodules for auto-update ...................................................................... Update gitmodules for auto-update And update i18n while we are at it. Change-Id: Ib83d729b09b59e61f26d53f3d6ab3adf2b94639b --- M .gitmodules M i18n 2 files changed, 3 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitmodules b/.gitmodules index 3ceaddf..47d7f6f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,6 +4,9 @@ [submodule "i18n"] path = i18n url = https://gerrit.wikimedia.org/r/p/pywikibot/i18n.git + branch = . + [submodule "externals/spelling"] path = externals/spelling url = https://gerrit.wikimedia.org/r/p/pywikibot/spelling.git + branch = . diff --git a/i18n b/i18n index 27a2b51..9199b7d 160000 --- a/i18n +++ b/i18n -Subproject commit 27a2b5108cd80bdecd0e126acd7727be80c1fc3a +Subproject commit 9199b7d0d5b5cc987c9089972d401e9ccba0f99a -- To view, visit https://gerrit.wikimedia.org/r/81402 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib83d729b09b59e61f26d53f3d6ab3adf2b94639b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] Add an __init__ file to externals so we can import it - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Add an __init__ file to externals so we can import it ...................................................................... Add an __init__ file to externals so we can import it This is mainly needed if you aren't using the pwb.py wrapper. Change-Id: I0f91d2fd36fec07583f232f107ead82c4b008afe --- A externals/__init__.py 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/externals/__init__.py b/externals/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/externals/__init__.py -- To view, visit https://gerrit.wikimedia.org/r/81397 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0f91d2fd36fec07583f232f107ead82c4b008afe Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] pep8-ified pywikibot/page.py - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: pep8-ified pywikibot/page.py ...................................................................... pep8-ified pywikibot/page.py Change-Id: Id2a7b648d306a2359ba0d7f1981c60b51a51833c --- M pywikibot/page.py 1 file changed, 172 insertions(+), 151 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 53c2fce..c13ae4e 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -87,8 +87,8 @@ self._revisions = {} else: raise pywikibot.Error( - "Invalid argument type '%s' in Page constructor: %s" - % (type(source), source)) + "Invalid argument type '%s' in Page constructor: %s" + % (type(source), source)) @property def site(self): @@ -138,7 +138,8 @@ if withSection and self._link.section: title = title + "#" + self._link.section if asLink: - if forceInterwiki or (allowInterwiki and + if forceInterwiki or \ + (allowInterwiki and \ (self.site.family.name != config.family or self.site.code != config.mylang)): if self.site.family.name != config.family \ @@ -234,9 +235,9 @@ if not hasattr(self, '_autoFormat'): from pywikibot import date self._autoFormat = date.getAutoFormat( - self.site.code, - self.title(withNamespace=False) - ) + self.site.code, + self.title(withNamespace=False) + ) return self._autoFormat def isAutoTitle(self): @@ -296,8 +297,8 @@ # If not already stored, fetch revision if not hasattr(self, "_revid") \ - or not self._revid in self._revisions \ - or self._revisions[self._revid].text is None: + or not self._revid in self._revisions \ + or self._revisions[self._revid].text is None: try: self.site.loadrevisions(self, getText=True, sysop=sysop) except (pywikibot.NoPage, pywikibot.SectionError), e: @@ -320,8 +321,10 @@ """ if force or not oldid in self._revisions \ or self._revisions[oldid].text is None: - self.site.loadrevisions(self, getText=True, revids=oldid, - sysop=sysop) + self.site.loadrevisions(self, + getText=True, + revids=oldid, + sysop=sysop) # TODO: what about redirects, errors? return self._revisions[oldid].text @@ -449,13 +452,12 @@ if template.title(withNamespace=False) in catredirs: # Get target (first template argument) try: - self._catredirect = self.site.namespace(14) \ - + ":" + args[0].strip() + self._catredirect = self.site.namespace(14) + ":" + args[0].strip() break except IndexError: pywikibot.warning( u"No target for category redirect on %s" - % self.title(asLink=True)) + % self.title(asLink=True)) self._catredirect = False break else: @@ -505,13 +507,15 @@ if self.namespace() == 1: return Page(self.site, self.title(withNamespace=False)) else: - return Page(self.site, - self.site.namespace(ns - 1) + ':' - + self.title(withNamespace=False)) + return Page( + self.site, + self.site.namespace(ns - 1) + ':' + self.title(withNamespace=False) + ) else: - return Page(self.site, - self.site.namespace(ns + 1) + ':' - + self.title(withNamespace=False)) + return Page( + self.site, + self.site.namespace(ns + 1) + ':' + self.title(withNamespace=False) + ) def isCategory(self): """Return True if the page is a Category, False otherwise.""" @@ -618,13 +622,16 @@ # the results for this method, or to implement this method and then # split up the results for the others. return self.site.pagereferences( - self, - followRedirects=follow_redirects, - filterRedirects=redirectsOnly, - withTemplateInclusion=withTemplateInclusion, - onlyTemplateInclusion=onlyTemplateInclusion, - namespaces=namespaces, step=step, - total=total, content=content) + self, + followRedirects=follow_redirects, + filterRedirects=redirectsOnly, + withTemplateInclusion=withTemplateInclusion, + onlyTemplateInclusion=onlyTemplateInclusion, + namespaces=namespaces, + step=step, + total=total, + content=content + ) def backlinks(self, followRedirects=True, filterRedirects=None, namespaces=None, step=None, total=None, content=False): @@ -641,11 +648,15 @@ of each referring page (default False) """ - return self.site.pagebacklinks(self, - followRedirects=followRedirects, - filterRedirects=filterRedirects, - namespaces=namespaces, step=step, - total=total, content=content) + return self.site.pagebacklinks( + self, + followRedirects=followRedirects, + filterRedirects=filterRedirects, + namespaces=namespaces, + step=step, + total=total, + content=content + ) def embeddedin(self, filter_redirects=None, namespaces=None, step=None, total=None, content=False): @@ -660,11 +671,14 @@ of each embedding page (default False) """ - return self.site.page_embeddedin(self, - filterRedirects=filter_redirects, - namespaces=namespaces, - step=step, total=total, - content=content) + return self.site.page_embeddedin( + self, + filterRedirects=filter_redirects, + namespaces=namespaces, + step=step, + total=total, + content=content + ) def canBeEdited(self): """Return bool indicating whether this page can be edited. @@ -816,12 +830,12 @@ if config.cosmetic_changes_mylang_only: cc = (family == config.family and \ self.site.lang == config.mylang) or \ - family in config.cosmetic_changes_enable.keys() and \ - self.site.lang in config.cosmetic_changes_enable[family] + family in config.cosmetic_changes_enable.keys() and \ + self.site.lang in config.cosmetic_changes_enable[family] else: cc = True cc = cc and not \ - (family in config.cosmetic_changes_disable.keys() and \ + (family in config.cosmetic_changes_disable.keys() and \ self.site.lang in config.cosmetic_changes_disable[family]) if not cc: return @@ -917,7 +931,7 @@ else: text = self.text for linkmatch in pywikibot.link_regex.finditer( - pywikibot.removeDisabledParts(text)): + pywikibot.removeDisabledParts(text)): linktitle = linkmatch.group("title") link = Link(linktitle, self.site) # only yield links that are to a different site and that @@ -1044,7 +1058,7 @@ intkeys[int(key)] = args[key] except ValueError: named[key] = args[key] - for i in xrange(1, len(intkeys)+1): + for i in xrange(1, len(intkeys) + 1): # only those args with consecutive integer keys can be # treated as positional; an integer could also be used # (out of order) as the key for a named argument @@ -1131,14 +1145,14 @@ """ self.site.loadrevisions(self, getText=False, rvdir=reverseOrder, - step=step, total=total) - return [ ( self._revisions[rev].revid, - self._revisions[rev].timestamp, - self._revisions[rev].user, - self._revisions[rev].comment + step=step, total=total) + return [(self._revisions[rev].revid, + self._revisions[rev].timestamp, + self._revisions[rev].user, + self._revisions[rev].comment ) for rev in sorted(self._revisions, reverse=not reverseOrder) - ] + ] def getVersionHistoryTable(self, forceReload=False, reverseOrder=False, step=None, total=None): @@ -1157,7 +1171,7 @@ return result def fullVersionHistory(self, reverseOrder=False, step=None, - total=None): + total=None): """Iterate previous versions including wikitext. Takes same arguments as getVersionHistory. @@ -1169,13 +1183,13 @@ self.site.loadrevisions(self, getText=True, rvdir=reverseOrder, step=step, total=total) - return [( self._revisions[rev].revid, - self._revisions[rev].timestamp, - self._revisions[rev].user, - self._revisions[rev].text - ) for rev in sorted(self._revisions, - reverse=not reverseOrder) - ] + return [(self._revisions[rev].revid, + self._revisions[rev].timestamp, + self._revisions[rev].user, + self._revisions[rev].text + ) for rev in sorted(self._revisions, + reverse=not reverseOrder) + ] def contributingUsers(self, step=None, total=None): """Return a set of usernames (or IPs) of users who edited this page. @@ -1210,8 +1224,8 @@ # TODO: implement "safe" parameter (Is this necessary ?) # TODO: implement "sysop" parameter return self.site.movepage(self, newtitle, reason, - movetalk=movetalkpage, - noredirect=deleteAndMove) + movetalk=movetalkpage, + noredirect=deleteAndMove) @deprecate_arg("throttle", None) def delete(self, reason=None, prompt=True, throttle=None, mark=False): @@ -1229,11 +1243,11 @@ reason = pywikibot.input(u'Please enter a reason for the deletion:') answer = u'y' if prompt and not hasattr(self.site, '_noDeletePrompt'): - answer = pywikibot.inputChoice(u'Do you want to delete %s?' - % self.title(asLink = True, forceInterwiki = True), - ['Yes', 'No', 'All'], - ['Y', 'N', 'A'], - 'N') + answer = pywikibot.inputChoice( + u'Do you want to delete %s?' % self.title(asLink=True, forceInterwiki=True), + ['Yes', 'No', 'All'], + ['Y', 'N', 'A'], + 'N') if answer in ['a', 'A']: answer = 'y' self.site._noDeletePrompt = True @@ -1280,7 +1294,7 @@ or "content" in self._deletedRevs["timestamp"]): return self._deletedRevs["timestamp"] for item in self.site.deletedrevs(self, start=timestamp, - get_text=retrieveText, total=1): + get_text=retrieveText, total=1): # should only be one item with one revision if item['title'] == self.title: if "revisions" in item: @@ -1325,7 +1339,7 @@ pywikibot.output(u'Preparing to undelete %s.' % (self.title(asLink=True))) comment = pywikibot.input( - u'Please enter a reason for the undeletion:') + u'Please enter a reason for the undeletion:') return self.site.undelete(self, comment) @deprecate_arg("throttle", None) @@ -1357,9 +1371,10 @@ answer = 'y' if prompt and not hasattr(self.site, '_noProtectPrompt'): answer = pywikibot.inputChoice( - u'Do you want to change the protection level of %s?' - % self.title(asLink=True, forceInterwiki = True), - ['Yes', 'No', 'All'], ['Y', 'N', 'A'], 'N') + u'Do you want to change the protection level of %s?' % self.title(asLink=True, forceInterwiki=True), + ['Yes', 'No', 'All'], + ['Y', 'N', 'A'], + 'N') if answer in ['a', 'A']: answer = 'y' self.site._noProtectPrompt = True @@ -1385,15 +1400,15 @@ if not self.canBeEdited(): pywikibot.output(u"Can't edit %s, skipping it..." - % self.title(asLink=True)) + % self.title(asLink=True)) return False - if inPlace == True: + if inPlace: newtext = pywikibot.replaceCategoryInPlace(self.text, oldCat, newCat) if newtext == self.text: pywikibot.output( u'No changes in made in page %s.' - % self.title(asLink=True)) + % self.title(asLink=True)) return False try: self.put(newtext, comment) @@ -1401,18 +1416,18 @@ except pywikibot.EditConflict: pywikibot.output( u'Skipping %s because of edit conflict' - % self.title(asLink=True)) + % self.title(asLink=True)) except pywikibot.LockedPage: pywikibot.output(u'Skipping locked page %s' - % self.title(asLink=True)) + % self.title(asLink=True)) except pywikibot.SpamfilterError, error: pywikibot.output( u'Changing page %s blocked by spam filter (URL=%s)' - % (self.title(asLink=True), error.url)) + % (self.title(asLink=True), error.url)) except pywikibot.NoUsername: pywikibot.output( u"Page %s not saved; sysop privileges required." - % self.title(asLink=True)) + % self.title(asLink=True)) except pywikibot.PageNotSaved, error: pywikibot.output(u"Saving page %s failed: %s" % (self.title(asLink=True), error.message)) @@ -1441,7 +1456,7 @@ if not changesMade: pywikibot.output(u'ERROR: %s is not in category %s!' - % (self.title(asLink=True), oldCat.title())) + % (self.title(asLink=True), oldCat.title())) else: try: text = pywikibot.replaceCategoryLinks(self.text, newCatList) @@ -1449,19 +1464,19 @@ # Make sure that the only way replaceCategoryLinks() can return # a ValueError is in the case of interwiki links to self. pywikibot.output( - u'Skipping %s because of interwiki link to self' % self) + u'Skipping %s because of interwiki link to self' % self) try: self.put(text, comment) except pywikibot.EditConflict: pywikibot.output( - u'Skipping %s because of edit conflict' % self.title()) + u'Skipping %s because of edit conflict' % self.title()) except pywikibot.SpamfilterError, e: pywikibot.output( - u'Skipping %s because of blacklist entry %s' - % (self.title(), e.url)) + u'Skipping %s because of blacklist entry %s' + % (self.title(), e.url)) except pywikibot.LockedPage: pywikibot.output( - u'Skipping %s because page is locked' % self.title()) + u'Skipping %s because page is locked' % self.title()) except pywikibot.PageNotSaved, error: pywikibot.output(u"Saving page %s failed: %s" % (self.title(asLink=True), error.message)) @@ -1640,8 +1655,8 @@ (default False) """ - return self.site.imageusage(self, - step=step, total=total, content=content) + return self.site.imageusage( + self, step=step, total=total, content=content) class Category(Page): @@ -1702,9 +1717,9 @@ recurse = recurse - 1 if not hasattr(self, "_subcats"): self._subcats = [] - for member in self.site.categorymembers(self, - namespaces=[14], step=step, total=total, - content=content): + for member in self.site.categorymembers( + self, namespaces=[14], step=step, + total=total, content=content): subcat = Category(self.site, member.title()) self._subcats.append(subcat) yield subcat @@ -1714,8 +1729,7 @@ return if recurse: for item in subcat.subcategories( - recurse, step=step, total=total, - content=content): + recurse, step=step, total=total, content=content): yield item if total is not None: total -= 1 @@ -1730,8 +1744,7 @@ return if recurse: for item in subcat.subcategories( - recurse, step=step, total=total, - content=content): + recurse, step=step, total=total, content=content): yield item if total is not None: total -= 1 @@ -1741,7 +1754,7 @@ @deprecate_arg("startFrom", None) def articles(self, recurse=False, step=None, total=None, content=False, namespaces=None, sortby="", - starttime=None, endtime=None,startsort=None, + starttime=None, endtime=None, startsort=None, endsort=None): """ Yields all articles in the current category. @@ -1782,7 +1795,7 @@ """ if namespaces is None: namespaces = [x for x in self.site.namespaces() - if x >= 0 and x <> 14] + if x >= 0 and x != 14] for member in self.site.categorymembers(self, namespaces=namespaces, step=step, total=total, @@ -1815,9 +1828,8 @@ content=False): """Yield all category contents (subcats, pages, and files).""" - for member in self.site.categorymembers(self, - namespaces, step=step, total=total, - content=content): + for member in self.site.categorymembers( + self, namespaces, step=step, total=total, content=content): yield member if total is not None: total -= 1 @@ -1828,8 +1840,8 @@ recurse = recurse - 1 for subcat in self.subcategories(step=step): for article in subcat.members( - recurse, namespaces, step=step, - total=total, content=content): + recurse, namespaces, step=step, + total=total, content=content): yield article if total is not None: total -= 1 @@ -1875,8 +1887,8 @@ targetCat = cat if targetCat.exists(): pywikibot.output(u'Target page %s already exists!' - % targetCat.title(), - level = pywikibot.WARNING) + % targetCat.title(), + level=pywikibot.WARNING) return False else: pywikibot.output('Moving text from %s to %s.' @@ -1914,11 +1926,12 @@ targetCat = Category(self.site, catname) if targetCat.exists(): pywikibot.warning(u'Target page %s already exists!' - % targetCat.title()) + % targetCat.title()) return False else: - pywikibot.output('Moving text from %s to %s.' - % {'oldcat': self.title(), 'authors': targetCat.title()}) + pywikibot.output( + 'Moving text from %s to %s.' + % {'oldcat': self.title(), 'authors': targetCat.title()}) authors = ', '.join(self.contributingUsers()) creationSummary = message % (self.title(), authors) newtext = self.get() @@ -1926,11 +1939,11 @@ matchcfd = re.compile(r"{{%s.*?}}" % regexName, re.IGNORECASE) newtext = matchcfd.sub('', newtext) matchcomment = re.compile( - r".*?", - re.IGNORECASE | re.MULTILINE | re.DOTALL) + r".*?", + re.IGNORECASE | re.MULTILINE | re.DOTALL) newtext = matchcomment.sub('', newtext) pos = 0 - while (newtext[pos:pos+1] == "\n"): + while (newtext[pos:pos + 1] == "\n"): pos = pos + 1 newtext = newtext[pos:] targetCat.put(newtext, creationSummary) @@ -2030,7 +2043,7 @@ if force: del self._userprops if not hasattr(self, '_userprops'): - self._userprops = list(self.site.users([self.username,]))[0] + self._userprops = list(self.site.users([self.username, ]))[0] if self.isAnonymous(): r = list(self.site.blocks(users=self.username)) if r: @@ -2134,9 +2147,9 @@ if subpage: subpage = u'/' + subpage return Page(Link(self.title(withNamespace=False) + subpage, - self.site, defaultNamespace=3)) + self.site, defaultNamespace=3)) - def sendMail(self, subject, text, ccme = False): + def sendMail(self, subject, text, ccme=False): """ Send an email to this user via mediawiki's email interface. Return True on success, False otherwise. This method can raise an UserActionRefuse exception in case this user @@ -2234,11 +2247,14 @@ @param namespaces: only iterate links in these namespaces @type namespaces: list """ - for contrib in self.site.usercontribs(user=self.username, - namespaces=namespaces, total=total): + for contrib in self.site.usercontribs( + user=self.username, namespaces=namespaces, total=total): ts = pywikibot.Timestamp.fromISOformat(contrib['timestamp']) - yield Page(self.site, contrib['title'], contrib['ns']), \ - contrib['revid'], ts, contrib.get('comment', None) + yield (Page(self.site, contrib['title'], contrib['ns']), \ + contrib['revid'], + ts, + contrib.get('comment', None) + ) @deprecate_arg("number", "total") def uploadedImages(self, total=10): @@ -2252,10 +2268,13 @@ """ if not self.isRegistered(): raise StopIteration - for item in self.site.logevents(logtype='upload', user=self.username, - total=total): - yield ImagePage(self.site, item.title().title()), \ - unicode(item.timestamp()), item.comment(), item.pageid() > 0 + for item in self.site.logevents( + logtype='upload', user=self.username, total=total): + yield (ImagePage(self.site, item.title().title()), \ + unicode(item.timestamp()), + item.comment(), + item.pageid() > 0 + ) class WikibasePage(Page): @@ -2369,9 +2388,9 @@ for lang in self._content['descriptions']: self.descriptions[lang] = self._content['descriptions'][lang]['value'] - return {'aliases':self.aliases, - 'labels':self.labels, - 'descriptions':self.descriptions, + return {'aliases': self.aliases, + 'labels': self.labels, + 'descriptions': self.descriptions, } def getID(self, numeric=False, force=False): @@ -2500,8 +2519,8 @@ Converts a Site.dbName() into a Site object. Rather hackish method that only works for WMF sites """ - lang = dbname.replace('wiki','') - lang = lang.replace('_','-') + lang = dbname.replace('wiki', '') + lang = lang.replace('_', '-') return pywikibot.Site(lang, 'wikipedia') def get(self, force=False, *args): @@ -2537,7 +2556,7 @@ 'descriptions': self.descriptions, 'sitelinks': self.sitelinks, 'claims': self.claims - } + } def iterlinks(self, family=None): """ @@ -2894,16 +2913,16 @@ """ illegal_titles_pattern = re.compile( - # Matching titles will be held as illegal. - ur'''[\x00-\x1f\x23\x3c\x3e\x5b\x5d\x7b\x7c\x7d\x7f]''' - # URL percent encoding sequences interfere with the ability - # to round-trip titles -- you can't link to them consistently. - u'|%[0-9A-Fa-f]{2}' - # XML/HTML character references produce similar issues. - u'|&[A-Za-z0-9\x80-\xff]+;' - u'|&#[0-9]+;' - u'|&#x[0-9A-Fa-f]+;' - ) + # Matching titles will be held as illegal. + ur'''[\x00-\x1f\x23\x3c\x3e\x5b\x5d\x7b\x7c\x7d\x7f]''' + # URL percent encoding sequences interfere with the ability + # to round-trip titles -- you can't link to them consistently. + u'|%[0-9A-Fa-f]{2}' + # XML/HTML character references produce similar issues. + u'|&[A-Za-z0-9\x80-\xff]+;' + u'|&#[0-9]+;' + u'|&#x[0-9A-Fa-f]+;' + ) def __init__(self, text, source=None, defaultNamespace=0): """Constructor @@ -2955,7 +2974,8 @@ # Replace underscores by spaces t = t.replace(u"_", u" ") # replace multiple spaces with a single space - while u" " in t: t = t.replace(u" ", u" ") + while u" " in t: + t = t.replace(u" ", u" ") # Strip spaces at both ends t = t.strip() # Remove left-to-right and right-to-left markers. @@ -2985,7 +3005,7 @@ # remove any subsequent whitespace t = t.lstrip(u":").lstrip(u" ") continue - prefix = t[ :t.index(u":")].lower() # part of text before : + prefix = t[:t.index(u":")].lower() # part of text before : ns = self._source.ns_index(prefix) if ns: # The prefix is a namespace in the source wiki @@ -2997,7 +3017,7 @@ if prefix in known: if known[prefix] == fam.name: # interwiki prefix links back to source family - t = t[t.index(u":")+1: ].lstrip(u" ") + t = t[t.index(u":") + 1:].lstrip(u" ") # strip off the prefix and retry continue # prefix is a different wiki family @@ -3025,22 +3045,22 @@ continue fam = self._site.family - prefix = t[ :t.index(u":")].lower() + prefix = t[:t.index(u":")].lower() ns = self._site.ns_index(prefix) if ns: # Ordinary namespace - t = t[t.index(u":"): ].lstrip(u":").lstrip(u" ") + t = t[t.index(u":"):].lstrip(u":").lstrip(u" ") self._namespace = ns break if prefix in fam.langs.keys()\ - or prefix in fam.get_known_families(site=self._site): + or prefix in fam.get_known_families(site=self._site): # looks like an interwiki link if not firstPass: # Can't make a local interwiki link to an interwiki link. raise pywikibot.Error( - "Improperly formatted interwiki link '%s'" - % self._text) - t = t[t.index(u":"): ].lstrip(u":").lstrip(u" ") + "Improperly formatted interwiki link '%s'" + % self._text) + t = t[t.index(u":"):].lstrip(u":").lstrip(u" ") if prefix in fam.langs.keys(): newsite = pywikibot.Site(prefix, fam) else: @@ -3051,17 +3071,18 @@ try: newsite = pywikibot.Site(otherlang, familyName) except ValueError: - raise pywikibot.Error("""\ + raise pywikibot.Error( + """\ %s is not a local page on %s, and the %s family is not supported by PyWikiBot!""" - % (self._text, self._site(), familyName)) + % (self._text, self._site(), familyName)) # Redundant interwiki prefix to the local wiki if newsite == self._site: if not t: # Can't have an empty self-link raise pywikibot.Error( - "Invalid link title: '%s'" % self._text) + "Invalid link title: '%s'" % self._text) firstPass = False continue self._site = newsite @@ -3078,7 +3099,7 @@ m = Link.illegal_titles_pattern.search(t) if m: raise pywikibot.InvalidTitle( - u"contains illegal char(s) '%s'" % m.group(0)) + u"contains illegal char(s) '%s'" % m.group(0)) # Pages with "/./" or "/../" appearing in the URLs will # often be unreachable due to the way web browsers deal @@ -3094,8 +3115,8 @@ or t.endswith(u"/..") ): raise pywikibot.InvalidTitle( - "(contains . / combinations): '%s'" - % self._text) + "(contains . / combinations): '%s'" + % self._text) # Magic tilde sequences? Nu-uh! if u"~~~" in t: @@ -3210,8 +3231,8 @@ def __hash__(self): return hash(u'%s:%s:%s' % (self.site.family.name, - self.site.code, - self.title)) + self.site.code, + self.title)) @staticmethod def fromPage(page, source=None): @@ -3225,8 +3246,8 @@ link._section = page.section() link._namespace = page.namespace() link._title = page.title(withNamespace=False, - allowInterwiki=False, - withSection=False) + allowInterwiki=False, + withSection=False) link._anchor = None link._source = source or pywikibot.Site() @@ -3338,7 +3359,7 @@ return result -def url2unicode(title, site, site2 = None): +def url2unicode(title, site, site2=None): """Convert url-encoded text to unicode using site's encoding. If site2 is provided, try its encodings as well. Uses the first encoding -- To view, visit https://gerrit.wikimedia.org/r/79596 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id2a7b648d306a2359ba0d7f1981c60b51a51833c Gerrit-PatchSet: 3 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] pep8: more whitespaces fixes - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: pep8: more whitespaces fixes ...................................................................... pep8: more whitespaces fixes count err# description 1 E222 multiple spaces after operator 1 E225 missing whitespace around operator 1 W291 trailing whitespace 2 E262 inline comment should start with '# ' 3 E302 expected 2 blank lines, found 1 3 E303 too many blank lines (2) 3 W293 blank line contains whitespace 31 E261 at least two spaces before inline comment Change-Id: I64bdd669ca0a8e41065b81a65167a62b65ee6eb6 --- M pywikibot/page.py M pywikibot/site.py M tests/site_tests.py 3 files changed, 49 insertions(+), 51 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index 8816da2..53c2fce 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -368,12 +368,12 @@ def expand_text(self, refresh=False): """Return the page text with all templates expanded.""" if not hasattr(self, "_expanded_text") or (self._expanded_text is None) or refresh: - req = pywikibot.data.api.Request(action="expandtemplates", + req = pywikibot.data.api.Request(action="expandtemplates", text=self.text, title=self.title(withSection=False), site=self.site) self._expanded_text = req.submit()["expandtemplates"]["*"] - + return self._expanded_text def userName(self): @@ -499,7 +499,7 @@ """ ns = self.namespace() - if ns < 0: # Special page + if ns < 0: # Special page return None if self.isTalkPage(): if self.namespace() == 1: @@ -691,7 +691,7 @@ """ # TODO: move this to Site object? - if config.ignore_bot_templates: #Check the "master ignore switch" + if config.ignore_bot_templates: # Check the "master ignore switch" return True username = self.site.user() try: @@ -803,7 +803,7 @@ pywikibot.log(u"Error saving page %s (%s)\n" % (link, err), exc_info=True) if not callback and not async: - raise pywikibot.PageNotSaved("%s: %s" %(link, err)) + raise pywikibot.PageNotSaved("%s: %s" % (link, err)) if callback: callback(self, err) @@ -1474,7 +1474,7 @@ """ if not self.isCategory(): - return None # should this raise an exception?? + return None # should this raise an exception?? try: return self.site.categoryinfo(self) except NotImplementedError: @@ -2207,7 +2207,7 @@ raise err @deprecated("contributions") - @deprecate_arg("limit", "total") # To be consistent with rest of framework + @deprecate_arg("limit", "total") # To be consistent with rest of framework def editedPages(self, total=500): """ Deprecated function that wraps 'contributions' for backwards compatibility. Yields pywikibot.Page objects that this user has @@ -2220,7 +2220,7 @@ for item in self.contributions(total=total): yield item[0] - @deprecate_arg("limit", "total") # To be consistent with rest of framework + @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 with an upper bound of @@ -2755,7 +2755,6 @@ wrap = {'mainsnak': data} return Claim.fromJSON(site, wrap) - def setTarget(self, value): """ Sets the target to the passed value. @@ -2845,8 +2844,6 @@ else: raise NotImplementedError('%s datatype is not supported yet.' % self.getType()) return value - - class Revision(object): @@ -2988,7 +2985,7 @@ # remove any subsequent whitespace t = t.lstrip(u":").lstrip(u" ") continue - prefix = t[ :t.index(u":")].lower() # part of text before : + prefix = t[ :t.index(u":")].lower() # part of text before : ns = self._source.ns_index(prefix) if ns: # The prefix is a namespace in the source wiki @@ -3264,6 +3261,7 @@ # Utility functions for parsing page titles + def html2unicode(text, ignore = None): """Return text, replacing HTML entities by equivalent unicode characters.""" if ignore is None: @@ -3275,33 +3273,33 @@ # These characters are Html-illegal, but sadly you *can* find some of # these and converting them to unichr(decimal) is unsuitable convertIllegalHtmlEntities = { - 128 : 8364, # € - 130 : 8218, # ‚ - 131 : 402, # ƒ - 132 : 8222, # „ - 133 : 8230, # … - 134 : 8224, # † - 135 : 8225, # ‡ - 136 : 710, # ˆ - 137 : 8240, # ‰ - 138 : 352, # Š - 139 : 8249, # ‹ - 140 : 338, # Œ - 142 : 381, # Ž - 145 : 8216, # ‘ - 146 : 8217, # ’ - 147 : 8220, # “ - 148 : 8221, # ” - 149 : 8226, # • - 150 : 8211, # – - 151 : 8212, # — - 152 : 732, # ˜ - 153 : 8482, # ™ - 154 : 353, # š - 155 : 8250, # › - 156 : 339, # œ - 158 : 382, # ž - 159 : 376 # Ÿ + 128 : 8364, # € + 130 : 8218, # ‚ + 131 : 402, # ƒ + 132 : 8222, # „ + 133 : 8230, # … + 134 : 8224, # † + 135 : 8225, # ‡ + 136 : 710, # ˆ + 137 : 8240, # ‰ + 138 : 352, # Š + 139 : 8249, # ‹ + 140 : 338, # Œ + 142 : 381, # Ž + 145 : 8216, # ‘ + 146 : 8217, # ’ + 147 : 8220, # “ + 148 : 8221, # ” + 149 : 8226, # • + 150 : 8211, # – + 151 : 8212, # — + 152 : 732, # ˜ + 153 : 8482, # ™ + 154 : 353, # š + 155 : 8250, # › + 156 : 339, # œ + 158 : 382, # ž + 159 : 376 # Ÿ } #ensuring that illegal   and &#157, which have no known values, #don't get converted to unichr(129), unichr(141) or unichr(157) @@ -3339,6 +3337,7 @@ found = False return result + def url2unicode(title, site, site2 = None): """Convert url-encoded text to unicode using site's encoding. diff --git a/pywikibot/site.py b/pywikibot/site.py index ec0f0b4..8f8c217 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2818,7 +2818,7 @@ "User %(user)s not allowed to edit through the API", "alreadyrolled": "Page [[%(title)s]] already rolled back; action aborted.", - } # other errors shouldn't arise because we check for those errors + } # other errors shouldn't arise because we check for those errors def rollbackpage(self, page, summary=u''): """Roll back page to version before last user's edits. @@ -2883,7 +2883,7 @@ "User %(user)s not authorized to delete pages on %(site)s wiki.", "cantdelete": "Could not delete [[%(title)s]]. Maybe it was deleted already.", - } # other errors shouldn't occur because of pre-submission checks + } # other errors shouldn't occur because of pre-submission checks def deletepage(self, page, summary): """Delete page from the wiki. Requires appropriate privilege level. @@ -2994,7 +2994,7 @@ NOTE 2: it returns the image title WITHOUT the image namespace. """ - if hash_found is None: # If the hash is none return None and not continue + if hash_found is None: # If the hash is none return None and not continue return None return [image.title(withNamespace=False) for image in self.allimages(sha1=hash_found)] @@ -3002,7 +3002,6 @@ @deprecated('Site().getFilesFromAnHash') def getImagesFromAnHash(self, hash_found=None): return self.getFilesFromAnHash(hash_found) - def upload(self, imagepage, source_filename=None, source_url=None, comment=None, watch=False, ignore_warnings=False): @@ -3108,7 +3107,7 @@ @deprecate_arg("repeat", None) @deprecate_arg("namespace", "namespaces") @deprecate_arg("rc_show", None) - @deprecate_arg("get_redirect", None) #20120822 + @deprecate_arg("get_redirect", None) # 20120822 def newpages(self, user=None, returndict=False, start=None, end=None, reverse=False, showBot=False, showRedirects=False, excludeuser=None, @@ -3435,7 +3434,7 @@ #Store it for 100 years req = api.CachedRequest(expiry, site=self, **params) data = req.submit() - dtype = data['entities'][prop.getID()]['datatype'] + dtype = data['entities'][prop.getID()]['datatype'] if dtype == 'globe-coordinate': dtype = 'globecoordinate' #TODO Fix this diff --git a/tests/site_tests.py b/tests/site_tests.py index cb29a0e..0877653 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -29,8 +29,8 @@ global mysite, mainpage, imagepage mysite = pywikibot.Site(cls.code, cls.family) mainpage = pywikibot.Page(pywikibot.Link("Main Page", mysite)) - imagepage = iter(mainpage.imagelinks()).next() # 1st image on main page - + imagepage = iter(mainpage.imagelinks()).next() # 1st image on main page + @classmethod def tearDownClass(cls): unpatch_request @@ -56,7 +56,7 @@ self.assertType(mysite.linktrail(), basestring) self.assertType(mysite.redirect(default=True), basestring) self.assertType(mysite.disambcategory(), pywikibot.Category) - self.assertEqual(mysite.linkto("foo"), u"[[Foo]]") # deprecated + self.assertEqual(mysite.linkto("foo"), u"[[Foo]]") # deprecated self.assertFalse(mysite.isInterwikiLink("foo")) self.assertType(mysite.redirectRegex().pattern, basestring) self.assertType(mysite.category_on_one_line(), bool) @@ -85,14 +85,14 @@ ipf = mysite.interwiki_putfirst() if ipf: # Not all languages use this self.assertType(ipf, list) - + for item in mysite.validLanguageLinks(): self.assertTrue(item in langs, item) def testNamespaceMethods(self): """Test cases for methods manipulating namespace names""" - builtins = {'Talk': 1, # these should work in any MW wiki + builtins = {'Talk': 1, # these should work in any MW wiki 'User': 2, 'User talk': 3, 'Project': 4, @@ -185,7 +185,7 @@ def testTokens(self): """Test ability to get page tokens""" - for ttype in ("edit", "move"): # token types for non-sysops + for ttype in ("edit", "move"): # token types for non-sysops self.assertType(mysite.token(mainpage, ttype), basestring) self.assertRaises(KeyError, mysite.token, mainpage, "invalidtype") -- To view, visit https://gerrit.wikimedia.org/r/81394 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64bdd669ca0a8e41065b81a65167a62b65ee6eb6 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Hashar <hashar(a)free.fr> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] bug fix from core and sync (to core) for version handling - change (pywikibot/compat)

by DrTrigon (Code Review)

DrTrigon has submitted this change and it was merged. Change subject: bug fix from core and sync (to core) for version handling ...................................................................... bug fix from core and sync (to core) for version handling * git version info extraction was buggy * minor changes introduced in core were ported Change-Id: I0a82d5c2139fdcbe27be64a39f0647e6be9be700 --- M pywikibot/version.py 1 file changed, 16 insertions(+), 10 deletions(-) Approvals: DrTrigon: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/version.py b/pywikibot/version.py index a9c6344..c96b74b 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -41,6 +41,7 @@ data['hsh'] = data['hsh'][:7] # make short hash from full hash return '%(tag)s (r%(rev)s, %(hsh)s, %(date)s, %(cmp_ver)s)' % data + def getversiondict(): global cache if cache: @@ -90,7 +91,7 @@ name, tag, rev, date = cur.fetchone() con.close() tag = tag[:-len(name)] - date = time.gmtime(date/1000000) + date = time.gmtime(date / 1000000) else: for i in xrange(3): entries.readline() @@ -107,6 +108,7 @@ raise ParseError return (tag, rev, date) + def getversion_git(path=None): _program_dir = path or _get_program_dir() #(try to use .git directory for new entries format) @@ -116,23 +118,26 @@ tag = open(os.path.join(_program_dir, '.git/config'), 'r').read() s = tag.find('url = ', tag.find('[remote "origin"]')) e = tag.find('\n', s) - tag = tag[(s+6):e] + tag = tag[(s + 6):e] t = tag.strip().split('/') - tag = '[%s] %s' % (t[0][:-1], '/'.join(t[3:])[:-4]) + tag = '[%s] %s' % (t[0][:-1], '/'.join(t[3:])[:-4]) info = subprocess.Popen("git log --pretty=format:'%ad|%an|%h|%H|%d' --abbrev-commit --date=iso -1 | cat -", + cwd=_program_dir, shell=True, stdout=subprocess.PIPE).stdout.read() info = info.split('|') date = info[0][:-6] date = time.strptime(date, '%Y-%m-%d %H:%M:%S') - rev = subprocess.Popen('git rev-list HEAD | wc -l', - shell=True, - stdout=subprocess.PIPE).stdout.read() - rev = int(rev.strip()) - hsh = info[3] # also stored in '.git/refs/heads/master' + rev = subprocess.Popen('git rev-list HEAD | wc -l', + cwd=_program_dir, + shell=True, + stdout=subprocess.PIPE).stdout.read() + rev = int(rev.strip()) + hsh = info[3] # also stored in '.git/refs/heads/master' if (not date or not tag or not rev) and not path: raise ParseError return (tag, rev, date, hsh) + def getversion_nightly(): data = open(os.path.join(wikipediatools.get_base_dir(), 'version')) @@ -142,6 +147,7 @@ if not date or not tag or not rev: raise ParseError return (tag, rev, date, '(unknown)') + def getversion_onlinerepo(repo=None): """ Retrieve revision number of framework online repository's svnroot """ @@ -156,7 +162,7 @@ ## Simple version comparison # -cmp_ver = lambda a, b, tol=1: {-1: '<', 0: '~', 1: '>'}[cmp((a-b)//tol, 0)] +cmp_ver = lambda a, b, tol=1: {-1: '<', 0: '~', 1: '>'}[cmp((a - b) // tol, 0)] def getfileversion(filename): @@ -172,7 +178,7 @@ if line.find('__version__') == 0: exec(line) break - stat = os.stat(fn) + stat = os.stat(fn) mtime = datetime.datetime.fromtimestamp(stat.st_mtime).isoformat(' ') if mtime and __version__: return u'%s %s %s' % (filename, __version__[5:-1][:7], mtime) -- To view, visit https://gerrit.wikimedia.org/r/81197 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a82d5c2139fdcbe27be64a39f0647e6be9be700 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] Update gitmodules - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Update gitmodules ...................................................................... Update gitmodules - externals/httplib2 now refers to our local mirror, with our patches - externals/httplib2 and scripts/i18n now use the same URL format as https://github.com/wikimedia/mediawiki-extensions/blob/master/.gitmodules to make Gerrit automatically update them. Hopefully. - externals/httplib2 and scripts/i18n have been updated to last master revision Change-Id: If5d04cbcaa45bc4a5619c1424629b214d3933a25 --- M .gitmodules M externals/httplib2 M scripts/i18n 3 files changed, 6 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitmodules b/.gitmodules index f862971..c8596ea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,9 @@ [submodule "i18n"] - path = scripts/i18n - url = https://gerrit.wikimedia.org/r/p/pywikibot/i18n.git + path = scripts/i18n + url = https://gerrit.wikimedia.org/r/p/pywikibot/i18n.git + branch = . + [submodule "externals/httplib2"] path = externals/httplib2 - url = https://github.com/iserko/httplib2.git + url = https://gerrit.wikimedia.org/r/p/pywikibot/externals/httplib2.git + branch = . diff --git a/externals/httplib2 b/externals/httplib2 index 989028e..552e08f 160000 --- a/externals/httplib2 +++ b/externals/httplib2 -Subproject commit 989028e51d283d04b46884b666d2ccde6452304f +Subproject commit 552e08fc711fadfc2d4bdca0d4c2863cd81e4ec6 diff --git a/scripts/i18n b/scripts/i18n index 27a2b51..9199b7d 160000 --- a/scripts/i18n +++ b/scripts/i18n -Subproject commit 27a2b5108cd80bdecd0e126acd7727be80c1fc3a +Subproject commit 9199b7d0d5b5cc987c9089972d401e9ccba0f99a -- To view, visit https://gerrit.wikimedia.org/r/81124 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If5d04cbcaa45bc4a5619c1424629b214d3933a25 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] bug fix and revert for version handling - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: bug fix and revert for version handling ...................................................................... bug fix and revert for version handling * git version info extraction was buggy * version handling was messed up by change of __version__ to __initversion__ (use __release__ instead!!) Change-Id: Ibbf5953bf8759f94323f9d31bded2c3095ba58a0 --- M pywikibot/__init__.py M pywikibot/version.py M scripts/version.py 3 files changed, 7 insertions(+), 6 deletions(-) Approvals: Legoktm: Looks good to me, approved DrTrigon: Checked; Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 27c9d52..414550d 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -7,8 +7,8 @@ # # Distributed under the terms of the MIT license. # -__version__ = '2.0b1' -__initversion__ = '$Id$' +__release__ = '2.0b1' +__version__ = '$Id$' import datetime import difflib diff --git a/pywikibot/version.py b/pywikibot/version.py index 6a8eb92..eb3e22c 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -10,8 +10,7 @@ __version__ = '$Id$' import os -import time -import datetime +import time, datetime import urllib import subprocess @@ -122,12 +121,14 @@ t = tag.strip().split('/') tag = '[%s] %s' % (t[0][:-1], '/'.join(t[3:])[:-4]) info = subprocess.Popen("git log --pretty=format:'%ad|%an|%h|%H|%d' --abbrev-commit --date=iso -1 | cat -", + cwd=_program_dir, shell=True, stdout=subprocess.PIPE).stdout.read() info = info.split('|') date = info[0][:-6] date = time.strptime(date, '%Y-%m-%d %H:%M:%S') rev = subprocess.Popen('git rev-list HEAD | wc -l', + cwd=_program_dir, shell=True, stdout=subprocess.PIPE).stdout.read() rev = int(rev.strip()) @@ -173,7 +174,7 @@ fn = os.path.join(_program_dir, filename) if os.path.exists(fn): for line in open(fn, 'r').readlines(): - if line.find('__initversion__') == 0: + if line.find('__version__') == 0: exec(line) break stat = os.stat(fn) diff --git a/scripts/version.py b/scripts/version.py index 32b06df..7cb2bc7 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -17,7 +17,7 @@ if __name__ == '__main__': print 'Pywikibot: %s' % getversion() - print 'Release version: %s' % pywikibot.__version__ + print 'Release version: %s' % pywikibot.__release__ print 'Python: %s' % sys.version #print 'config-settings:' #print 'site_interface =', config.site_interface -- To view, visit https://gerrit.wikimedia.org/r/81196 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibbf5953bf8759f94323f9d31bded2c3095ba58a0 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] pep8: fix up various whitespaces - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: pep8: fix up various whitespaces ...................................................................... pep8: fix up various whitespaces This clear out trailing whitespaces, adds double newlines before class definition and some other trivial spaces changes. Change-Id: I78c509575cbf6616e86308a1df89280b116aa39e --- M pwb.py M scripts/tests/test_data_ingestion.py M tests/__init__.py M tests/i18n/test.py M tests/textlib_tests.py M tests/ui_tests.py M tests/utils.py M tests/wikibase_tests.py 8 files changed, 28 insertions(+), 23 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 6d58bbf..532272a 100644 --- a/pwb.py +++ b/pwb.py @@ -32,7 +32,7 @@ if "PYWIKIBOT2_DIR" not in os.environ: os.environ["PYWIKIBOT2_DIR"] = os.path.split(__file__)[0] -for i,x in enumerate(sys.argv): +for i, x in enumerate(sys.argv): if x.startswith("-dir:"): os.environ["PYWIKIBOT2_DIR"] = x[5:] sys.argv.pop(i) diff --git a/scripts/tests/test_data_ingestion.py b/scripts/tests/test_data_ingestion.py index 568a6aa..4ab2cb9 100644 --- a/scripts/tests/test_data_ingestion.py +++ b/scripts/tests/test_data_ingestion.py @@ -12,9 +12,10 @@ import data_ingestion + class TestPhoto(unittest.TestCase): def setUp(self): - self.obj = data_ingestion.Photo(URL='http://upload.wikimedia.org/wikipedia/commons/f/fc/MP_sounds.png', + self.obj = data_ingestion.Photo(URL='http://upload.wikimedia.org/wikipedia/commons/f/fc/MP_sounds.png', metadata={'description.en': '"Sounds" icon', 'source': 'http://commons.wikimedia.org/wiki/File:Sound-icon.svg', 'author': 'KDE artists | Silstor', diff --git a/tests/__init__.py b/tests/__init__.py index e0c4f27..92b921d 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -24,6 +24,7 @@ def _expired(self, dt): return False + def patch_request(): pywikibot.data.api.Request = TestRequest diff --git a/tests/i18n/test.py b/tests/i18n/test.py index a1115fb..f93769a 100644 --- a/tests/i18n/test.py +++ b/tests/i18n/test.py @@ -1,12 +1,12 @@ # -*- coding=utf-8 -*- msg = { - 'en': {'test-localized': u'test-localized EN', - 'test-semi-localized': u'test-semi-localized EN', - 'test-non-localized': u'test-non-localized EN' - }, - 'nl': {'test-localized': u'test-localized NL', - 'test-semi-localized': u'test-semi-localized NL', - }, - 'fy': {'test-localized': u'test-localized FY'}, - 'ja': {'test-no-english': u'test-no-english JA'} - } + 'en': {'test-localized': u'test-localized EN', + 'test-semi-localized': u'test-semi-localized EN', + 'test-non-localized': u'test-non-localized EN' + }, + 'nl': {'test-localized': u'test-localized NL', + 'test-semi-localized': u'test-semi-localized NL', + }, + 'fy': {'test-localized': u'test-localized FY'}, + 'ja': {'test-no-english': u'test-no-english JA'} + } diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 5a4d3f5..3f504c0 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -23,10 +23,11 @@ for f in ["enwiki_help_editing"]: files[f] = codecs.open(os.path.join(dirname, f + ".page"), 'r', 'utf-8').read() + class TestSectionFunctions(unittest.TestCase): def contains(self, fn, sn): return textlib.does_text_contain_section( - files[fn], sn) + files[fn], sn) def assertContains(self, fn, sn, *args, **kwargs): self.assertEqual(self.contains(fn, sn), True, *args, **kwargs) diff --git a/tests/ui_tests.py b/tests/ui_tests.py index 38a1d0f..d4ba066 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -49,7 +49,7 @@ def set_ui(self, key, value): import pywikibot setattr(pywikibot.ui, key, value) - + def cls(self): os.system('cls') @@ -101,15 +101,15 @@ newstdout.truncate(0) newstderr.truncate(0) newstdin.truncate(0) - + pywikibot.config.colorized_output = True pywikibot.config.transliterate = False pywikibot.ui.transliteration_target = None pywikibot.ui.encoding = 'utf-8' def tearDown(self): - unpatch() - + unpatch() + class TestTerminalOutput(UITestCase): def testOutputLevels_logging_debug(self): logger.log(DEBUG, 'debug', extra=loggingcontext) @@ -269,7 +269,7 @@ returned = pywikibot.inputChoice("question", ["answer 1", "answer 2", "answer 3"], ["A", "N", "S"], "A") self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "question ([A]nswer 1, a[N]swer 2, an[S]wer 3) "*2) + self.assertEqual(newstderr.getvalue(), "question ([A]nswer 1, a[N]swer 2, an[S]wer 3) " * 2) self.assertIsInstance(returned, unicode) self.assertEqual(returned, "n") @@ -325,7 +325,7 @@ pywikibot.config.transliterate = True pywikibot.output(u"abcd АБГД αβγδ あいうえお") self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "abcd \x1b[33;1mA\x1b[0m\x1b[33;1mB\x1b[0m\x1b[33;1mG\x1b[0m\x1b[33;1mD\x1b[0m \x1b[33;1ma\x1b[0m\x1b[33;1mb\x1b[0m\x1b[33;1mg\x1b[0m\x1b[33;1md\x1b[0m \x1b[33;1ma\x1b[0m\x1b[33;1mi\x1b[0m\x1b[33;1mu\x1b[0m\x1b[33;1me\x1b[0m\x1b[33;1mo\x1b[0m\n\x1b[0m") # noqa + self.assertEqual(newstderr.getvalue(), "abcd \x1b[33;1mA\x1b[0m\x1b[33;1mB\x1b[0m\x1b[33;1mG\x1b[0m\x1b[33;1mD\x1b[0m \x1b[33;1ma\x1b[0m\x1b[33;1mb\x1b[0m\x1b[33;1mg\x1b[0m\x1b[33;1md\x1b[0m \x1b[33;1ma\x1b[0m\x1b[33;1mi\x1b[0m\x1b[33;1mu\x1b[0m\x1b[33;1me\x1b[0m\x1b[33;1mo\x1b[0m\n\x1b[0m") # noqa @unittest.skipUnless(os.name == "nt", "requires Windows console") class TestWindowsTerminalUnicode(UITestCase): @@ -341,7 +341,7 @@ creationflags=subprocess.CREATE_NEW_CONSOLE) _manager.connect() cls.pywikibot = _manager.pywikibot() - + cls._app = pywinauto.application.Application() cls._app.connect_(process=cls._process.pid) @@ -380,13 +380,13 @@ def setUp(self): super(TestWindowsTerminalUnicode, self).setUp() - + self.pywikibot.set_config('colorized_output', True) self.pywikibot.set_config('transliterate', False) self.pywikibot.set_config('console_encoding', 'utf-8') self.pywikibot.set_ui('transliteration_target', None) self.pywikibot.set_ui('encoding', 'utf-8') - + self.pywikibot.cls() self.setclip(u'') diff --git a/tests/utils.py b/tests/utils.py index 77f0d75..2aa8307 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -1,6 +1,7 @@ import unittest + class PywikibotTestCase(unittest.TestCase): def assertType(self, obj, cls): """Assert that obj is an instance of type cls""" - return self.assertTrue(isinstance(obj, cls)) \ No newline at end of file + return self.assertTrue(isinstance(obj, cls)) diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 5caaabf..878de0a 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -20,6 +20,7 @@ mainpage = pywikibot.Page(pywikibot.page.Link("Main Page", site)) wikidata = site.data_repository() + class TestGeneral(PywikibotTestCase): def testWikibase(self): if not site.has_transcluded_data: -- To view, visit https://gerrit.wikimedia.org/r/81377 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I78c509575cbf6616e86308a1df89280b116aa39e Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Hashar <hashar(a)free.fr> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

[Gerrit] forgot to adopt messages for sunos and win users - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: forgot to adopt messages for sunos and win users ...................................................................... forgot to adopt messages for sunos and win users Change-Id: I9cb6e6734257803d551c830f0a5357776223ec9a --- M externals/__init__.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/externals/__init__.py b/externals/__init__.py index b355d6d..a910e52 100644 --- a/externals/__init__.py +++ b/externals/__init__.py @@ -325,12 +325,12 @@ def sunos_install(dependency_dictionary): - lowlevel_warning(u'Not implemented yet, download mode will be used.') + lowlevel_warning(u'Not implemented yet, use download mode (2) instead.') return False # skip this in order to trigger 'download_install' next def windows_install(dependency_dictionary): - lowlevel_warning(u'Not available in windows OS, download mode will be used.') + lowlevel_warning(u'Not available in windows OS, use download mode (2) instead.') return False # skip this in order to trigger 'download_install' next ### END of VisTrails inspired and copied code ### ### ### ### ### ### ### ### -- To view, visit https://gerrit.wikimedia.org/r/81369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9cb6e6734257803d551c830f0a5357776223ec9a Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: DrTrigon <dr.trigon(a)surfeu.ch> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot

10 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits August 2013