jenkins-bot has submitted this change and it was merged.
Change subject: Use the language of the page, not necessarily the general site
......................................................................
Use the language of the page, not necessarily the general site
It's possible that the user specificies a generator like
-cat:zh:Category:Blah", in which case the value of
pywikibot.Site().language() may not be "zh", depending
on the user's config. It's also possible that in the future
a generator will yield pages on multiple projects, so this
guards against that as well.
Change-Id: Ic1f10118a2dff93b71861b7ea97f7da22908cb04
---
M scripts/claimit.py
M scripts/harvest_template.py
2 files changed, 46 insertions(+), 29 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/claimit.py b/scripts/claimit.py
index 0f50db0..e72e804 100755
--- a/scripts/claimit.py
+++ b/scripts/claimit.py
@@ -33,23 +33,29 @@
self.generator = generator
self.claims = claims
self.repo = pywikibot.Site().data_repository()
- self.source = None
- self.setSource(pywikibot.Site().language())
+ self.cacheSources()
- def setSource(self, lang):
+ def getSource(self, lang):
"""
- Get the source
+ Get the source for the specified language,
+ if possible
"""
- page = pywikibot.Page(self.repo, 'Wikidata:List of wikis/python')
- source_values = json.loads(page.get())
- source_values = source_values['wikipedia']
- for source_lang in source_values:
- source_values[source_lang] = pywikibot.ItemPage(self.repo,
- source_values[source_lang])
+ if lang in self.source_values:
+ source = pywikibot.Claim(self.repo, 'p143')
+ source.setTarget(self.source_values.get(lang))
+ return source
- if lang in source_values:
- self.source = pywikibot.Claim(self.repo, 'p143')
- self.source.setTarget(source_values.get(lang))
+ def cacheSources(self):
+ """
+ Fetches the sources from the onwiki list
+ and stores it internally
+ """
+ page = pywikibot.Page(self.repo, u'Wikidata:List of wikis/python')
+ self.source_values = json.loads(page.get())
+ self.source_values = self.source_values['wikipedia']
+ for source_lang in self.source_values:
+ self.source_values[source_lang] = pywikibot.ItemPage(self.repo,
+ self.source_values[source_lang])
def run(self):
"""
@@ -72,8 +78,10 @@
pywikibot.output('Adding %s --> %s'
% (claim.getID(), claim.getTarget()))
item.addClaim(claim)
- if self.source:
- claim.addSource(self.source, bot=True)
+ # A generator might yield pages from multiple languages
+ source = self.getSource(page.site.language())
+ if source:
+ claim.addSource(source, bot=True)
# TODO FIXME: We need to check that we aren't adding a
# duplicate
diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py
index 2bc5ace..40e43a3 100755
--- a/scripts/harvest_template.py
+++ b/scripts/harvest_template.py
@@ -45,22 +45,29 @@
# TODO: Make it a list which also includes the redirects to the template
self.fields = fields
self.repo = pywikibot.Site().data_repository()
- self.source = None
- self.setSource(pywikibot.Site().language())
+ self.cacheSources()
- def setSource(self, lang):
+ def getSource(self, lang):
"""
- Get the source
+ Get the source for the specified language,
+ if possible
"""
- page = pywikibot.Page(self.repo, 'Wikidata:List of wikis/python')
- source_values = json.loads(page.get())
- source_values = source_values['wikipedia']
- for source_lang in source_values:
- source_values[source_lang] = pywikibot.ItemPage(self.repo, source_values[source_lang])
+ if lang in self.source_values:
+ source = pywikibot.Claim(self.repo, 'p143')
+ source.setTarget(self.source_values.get(lang))
+ return source
- if lang in source_values:
- self.source = pywikibot.Claim(self.repo, 'p143')
- self.source.setTarget(source_values.get(lang))
+ def cacheSources(self):
+ """
+ Fetches the sources from the onwiki list
+ and stores it internally
+ """
+ page = pywikibot.Page(self.repo, u'Wikidata:List of wikis/python')
+ self.source_values = json.loads(page.get())
+ self.source_values = self.source_values['wikipedia']
+ for source_lang in self.source_values:
+ self.source_values[source_lang] = pywikibot.ItemPage(self.repo,
+ self.source_values[source_lang])
def run(self):
"""
@@ -135,8 +142,10 @@
pywikibot.output('Adding %s --> %s' % (claim.getID(), claim.getTarget()))
item.addClaim(claim)
- if self.source:
- claim.addSource(self.source, bot=True)
+ # A generator might yield pages from multiple sites
+ source = self.getSource(page.site.language())
+ if source:
+ claim.addSource(source, bot=True)
def main():
--
To view, visit https://gerrit.wikimedia.org/r/82263
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1f10118a2dff93b71861b7ea97f7da22908cb04
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
jenkins-bot has submitted this change and it was merged.
Change subject: Allow both upper- and lowercase wikibase IDs
......................................................................
Allow both upper- and lowercase wikibase IDs
Change-Id: Id7c29981e8dde7c041a16b43bcc2658faf7b0c94
---
M pywikibot/site.py
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
Aude: Looks good to me, but someone else must approve
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 43ec1df..17566e9 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -3515,7 +3515,16 @@
#Store it for 100 years
req = api.CachedRequest(expiry, site=self, **params)
data = req.submit()
- dtype = data['entities'][prop.getID()]['datatype']
+
+ # the IDs returned from the API can be upper or lowercase, depending
+ # on the version. See for more information:
+ # https://bugzilla.wikimedia.org/show_bug.cgi?id=53894
+ # http://lists.wikimedia.org/pipermail/wikidata-tech/2013-September/000296.ht…
+ try:
+ dtype = data['entities'][prop.getID()]['datatype']
+ except KeyError:
+ dtype = data['entities'][prop.getID().lower()]['datatype']
+
if dtype == 'globe-coordinate':
dtype = 'globecoordinate'
#TODO Fix this
--
To view, visit https://gerrit.wikimedia.org/r/83661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id7c29981e8dde7c041a16b43bcc2658faf7b0c94
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Aude <aude.wiki(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
Ladsgroup has submitted this change and it was merged.
Change subject: Wikibase now uses uppercase ids.
......................................................................
Wikibase now uses uppercase ids.
We now force IDs to be uppercase rather than lowercase.
Change-Id: I19a33f60ea72e447f8a971279f149947d4e46bfd
Announcement: http://lists.wikimedia.org/pipermail/wikidata-tech/2013-September/000296.ht…
---
M pywikibot/page.py
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Ladsgroup: Verified; Looks good to me, approved
diff --git a/pywikibot/page.py b/pywikibot/page.py
index a20d7ce..3b250c0 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -2506,7 +2506,7 @@
@param title: id number of item, "Q###"
"""
super(ItemPage, self).__init__(site, title, ns=0)
- self.id = title.lower()
+ self.id = title.upper() # This might cause issues if not ns0?
@classmethod
def fromPage(cls, page):
@@ -2672,7 +2672,7 @@
@param title: page name of property, like "Property:P##"
"""
WikibasePage.__init__(self, source, title, ns=120)
- self.id = self.title(withNamespace=False).lower()
+ self.id = self.title(withNamespace=False).upper()
if not self.id.startswith(u'p'):
raise ValueError(u"'%s' is not a property page!" % self.title())
@@ -2697,7 +2697,7 @@
"""
def __init__(self, site, title):
WikibasePage.__init__(self, site, title, ns=122)
- self.id = self.title(withNamespace=False).lower()
+ self.id = self.title(withNamespace=False).upper()
if not self.id.startswith(u'u'):
raise ValueError(u"'%s' is not a query page!" % self.title())
--
To view, visit https://gerrit.wikimedia.org/r/83643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I19a33f60ea72e447f8a971279f149947d4e46bfd
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: jenkins-bot
jenkins-bot has submitted this change and it was merged.
Change subject: login.py: use site.code instead of site.lang
......................................................................
login.py: use site.code instead of site.lang
The code used for the site is not necessary the same as the language -
this is clear for instance for commons (site.code = 'commons',
site.lang = 'en') and wikidata.
Changing this means logging in works for people using
mysite = 'wikidata'; family = 'wikidata'
where before this resulted in a cryptic
en.wikidata is not a valid site, please remove it from your config
error message.
Change-Id: I978437feb4862a7f1fc688fcd9ba4dee6d315c67
---
M scripts/login.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/login.py b/scripts/login.py
index afdc9a4..53638e6 100755
--- a/scripts/login.py
+++ b/scripts/login.py
@@ -81,7 +81,7 @@
namedict = config.usernames
else:
site = pywikibot.getSite()
- namedict = {site.family.name: {site.lang: None}}
+ namedict = {site.family.name: {site.code: None}}
for familyName in namedict:
for lang in namedict[familyName]:
try:
--
To view, visit https://gerrit.wikimedia.org/r/82883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I978437feb4862a7f1fc688fcd9ba4dee6d315c67
Gerrit-PatchSet: 1
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
jenkins-bot has submitted this change and it was merged.
Change subject: Suggest git.wikimedia.org as httplib2 download site
......................................................................
Suggest git.wikimedia.org as httplib2 download site
See Wieland Hoffmanns mail [1] for more details; this should prevent
setup.py install from installing an non-functional httplib2 (that
is: one with outdated SSL certificated)
[1] http://article.gmane.org/gmane.comp.python.pywikipediabot.general/13432
Change-Id: Ia0f91237dde1565a6dd71206c2e0477690cf3855
---
M setup.py
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/setup.py b/setup.py
index a73bc36..db0ea02 100644
--- a/setup.py
+++ b/setup.py
@@ -30,6 +30,9 @@
install_requires=[
'httplib2>=0.6.0'
],
+ dependency_links=[
+ 'https://git.wikimedia.org/zip/?r=pywikibot/externals/httplib2.git&format=gz…'
+ ],
test_suite="tests",
classifiers=[
'License :: OSI Approved :: MIT License',
--
To view, visit https://gerrit.wikimedia.org/r/83370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0f91237dde1565a6dd71206c2e0477690cf3855
Gerrit-PatchSet: 1
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
jenkins-bot has submitted this change and it was merged.
Change subject: Function to check whether a site has a certain extension loaded
......................................................................
Function to check whether a site has a certain extension loaded
Change-Id: I0fc57f974b19da5d929f119f759f5cd6d56c5e43
---
M pywikibot/site.py
1 file changed, 9 insertions(+), 1 deletion(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 2775f2b..43ec1df 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -1086,7 +1086,7 @@
site=self,
action="query",
meta="siteinfo",
- siprop="general|namespaces|namespacealiases"
+ siprop="general|namespaces|namespacealiases|extensions"
)
try:
sidata = sirequest.submit()
@@ -1127,6 +1127,14 @@
# this is a less preferred form so it goes at the end
self._namespaces[int(item['id'])].append(item["*"])
+ def hasExtension(self, name):
+ if not 'extensions' in self.siteinfo:
+ return NotImplementedError("Feature 'hasExtension' only available in MW 1.14+")
+ for ext in self.siteinfo['extensions']:
+ if ext['name'] == name:
+ return True
+ return False
+
@property
def siteinfo(self):
"""Site information dict."""
--
To view, visit https://gerrit.wikimedia.org/r/82791
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0fc57f974b19da5d929f119f759f5cd6d56c5e43
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com>
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: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change and it was merged.
Change subject: Make return value of defaultsort more explicit
......................................................................
Make return value of defaultsort more explicit
In a seperate commit to prevent a big rebase mess.
Change-Id: I5300844e8c992014ecb13e9eaa77cdc56e1678b5
---
M pywikibot/page.py
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 4147b4f..7bbc327 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -380,9 +380,10 @@
def defaultsort(self, force=False):
"""
- Returns the value of {{DEFAULTSORT:}} magic word
+ Returns the value of {{DEFAULTSORT:}} magic word or None if no
+ defaultsort has been defined.
@param force: force updating from the live site
- @return: unicode
+ @return: unicode or None
"""
return self.properties(force=force).get('defaultsort')
--
To view, visit https://gerrit.wikimedia.org/r/83005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5300844e8c992014ecb13e9eaa77cdc56e1678b5
Gerrit-PatchSet: 1
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
jenkins-bot has submitted this change and it was merged.
Change subject: Support for fetching page properties
......................................................................
Support for fetching page properties
Added a convenience function for fetching
the defaultsort value.
Change-Id: I0752f1560e0e93cba0e01a9a1ea834e35f8a725c
---
M pywikibot/data/api.py
M pywikibot/page.py
M pywikibot/site.py
3 files changed, 35 insertions(+), 0 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 2b23fb4..17f4db9 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -989,6 +989,9 @@
coords.append(coord)
page._coords = coords
+ if "pageprops" in pagedict:
+ page._pageprops = pagedict['pageprops']
+
if __name__ == "__main__":
from pywikibot import Site, logging
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 59108e3..4147b4f 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -368,6 +368,24 @@
if hasattr(self, "_text"):
del self._text
+ def properties(self, force=False):
+ """
+ Returns the various page properties stored for a page
+ @param force: force updating from the live site
+ @return: dict
+ """
+ if not hasattr(self, '_pageprops') or force:
+ self.site.loadpageprops(self)
+ return self._pageprops
+
+ def defaultsort(self, force=False):
+ """
+ Returns the value of {{DEFAULTSORT:}} magic word
+ @param force: force updating from the live site
+ @return: unicode
+ """
+ return self.properties(force=force).get('defaultsort')
+
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:
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 1c0b144..5050f78 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -1266,6 +1266,20 @@
continue
api.update_page(page, pageitem)
+ def loadpageprops(self, page):
+ title = page.title(withSection=False)
+ query = self._generator(api.PropertyGenerator,
+ type_arg="pageprops",
+ titles=title.encode(self.encoding()),
+ )
+ for pageitem in query:
+ if not self.sametitle(pageitem['title'], title):
+ pywikibot.warning(
+ u"loadpageprops: Query on %s returned data on '%s'"
+ % (page, pageitem['title']))
+ continue
+ api.update_page(page, pageitem)
+
def loadimageinfo(self, page, history=False):
"""Load image info from api and save in page attributes
--
To view, visit https://gerrit.wikimedia.org/r/82769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0752f1560e0e93cba0e01a9a1ea834e35f8a725c
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com>
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
jenkins-bot has submitted this change and it was merged.
Change subject: If we already have pageproperties, use it for ItemPage.fromPage
......................................................................
If we already have pageproperties, use it for ItemPage.fromPage
The Wikibase Id is stored in the pageproperties, so lets use
it if we can.
Change-Id: I1a4a7d4235bd4e3717f0e6248ab90f10460f264b
---
M pywikibot/page.py
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 4147b4f..07fe099 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -2526,8 +2526,14 @@
def fromPage(cls, page):
"""
Get the ItemPage based on a Page that links to it
+ @param page: Page
+ @return: ItemPage
"""
repo = page.site.data_repository()
+ if hasattr(page, '_pageprops') and page.properties().get('wikibase_item'):
+ # If we have already fetched the pageprops for something else,
+ # we already have the id, so use it
+ return cls(repo, page.properties().get('wikibase_item'))
i = cls(repo, 'null')
del i.id
i._site = page.site
--
To view, visit https://gerrit.wikimedia.org/r/82775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a4a7d4235bd4e3717f0e6248ab90f10460f264b
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com>
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
jenkins-bot has submitted this change and it was merged.
Change subject: Limit ItemPage preloading to existing pages
......................................................................
Limit ItemPage preloading to existing pages
[[d:Q6]] does not exist, so just go up to and including [[d:Q5]].
Change-Id: I712d0138529af20dd1c88c726aa1122ae3567b46
---
M tests/site_tests.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/site_tests.py b/tests/site_tests.py
index 14720f8..6d41c98 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -202,7 +202,7 @@
datasite = mysite.data_repository()
- items = [pywikibot.ItemPage(datasite, 'q' + str(num)) for num in range(1, 11)]
+ items = [pywikibot.ItemPage(datasite, 'q' + str(num)) for num in range(1, 6)]
for page in datasite.preloaditempages(items):
self.assertTrue(hasattr(page, '_content'))
--
To view, visit https://gerrit.wikimedia.org/r/82891
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I712d0138529af20dd1c88c726aa1122ae3567b46
Gerrit-PatchSet: 2
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
jenkins-bot has submitted this change and it was merged.
Change subject: Implement a preloading generator for ItemPages
......................................................................
Implement a preloading generator for ItemPages
Since it becomes near impossible to find which specific
item lines up with which original page object, we just
create new objects and yield those.
WikibasePage.__defined_by had to be renamed so it is
no longer a private method.
Change-Id: I05917eb982f41dcdc92d8e45292ba6c27eac47f7
---
M pywikibot/page.py
M pywikibot/pagegenerators.py
M pywikibot/site.py
M tests/site_tests.py
4 files changed, 69 insertions(+), 2 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 7956ae1..1244a72 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -2293,7 +2293,11 @@
del self._link._title
return Page(self).title(**kwargs)
+ @deprecated("_defined_by")
def __defined_by(self, singular=False):
+ return self._defined_by(singular=singular)
+
+ def _defined_by(self, singular=False):
"""
returns the parameters needed by the API to identify an item.
Once an item's "p/q##" is looked up, that will be used for all future
@@ -2342,7 +2346,7 @@
args can be used to specify custom props.
"""
if force or not hasattr(self, '_content'):
- data = self.repo.loadcontent(self.__defined_by(), *args)
+ data = self.repo.loadcontent(self._defined_by(), *args)
self.id = data.keys()[0]
self._content = data[self.id]
if 'lastrevid' in self._content:
@@ -2429,7 +2433,7 @@
baserevid = self.lastrevid
else:
baserevid = None
- updates = self.repo.editEntity(self.__defined_by(singular=True), data,
+ updates = self.repo.editEntity(self._defined_by(singular=True), data,
baserevid=baserevid, **kwargs)
self.lastrevid = updates['entity']['lastrevid']
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index c6e8c7d..0fbfa63 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -797,16 +797,44 @@
site = page.site
sites.setdefault(site, []).append(page)
if len(sites[site]) >= step:
+ # if this site is at the step, process it
group = sites[site]
sites[site] = []
for i in site.preloadpages(group, step):
yield i
for site in sites:
if sites[site]:
+ # process any leftover sites that never reached the step
for i in site.preloadpages(sites[site], step):
yield i
+def PreloadingItemGenerator(generator, step=50):
+ """
+ Yield preloaded pages taken from another generator.
+
+ Function basically is copied from above, but for ItemPage's
+
+ @param generator: pages to iterate over
+ @param step: how many pages to preload at once
+ """
+ sites = {}
+ for page in generator:
+ site = page.site
+ sites.setdefault(site, []).append(page)
+ if len(sites[site]) >= step:
+ # if this site is at the step, process it
+ group = sites[site]
+ sites[site] = []
+ for i in site.preloaditempages(group, step):
+ yield i
+ for site in sites:
+ if sites[site]:
+ # process any leftover sites that never reached the step
+ for i in site.preloaditempages(sites[site], step):
+ yield i
+
+
def NewimagesPageGenerator(step=None, total=None, site=None):
if site is None:
site = pywikibot.Site()
diff --git a/pywikibot/site.py b/pywikibot/site.py
index ef00047..920b414 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -3398,6 +3398,32 @@
raise pywikibot.data.api.APIError, data['errors']
return data['entities']
+ def preloaditempages(self, pagelist, groupsize=50):
+ """Yields ItemPages with content prefilled.
+
+ Note that pages will be iterated in a different order
+ than in the underlying pagelist.
+
+ @param pagelist: an iterable that yields ItemPage objects
+ @param groupsize: how many pages to query at a time
+ @type groupsize: int
+ """
+ from pywikibot.tools import itergroup
+ for sublist in itergroup(pagelist, groupsize):
+ req = {'ids': [], 'titles': [], 'sites': []}
+ for p in sublist:
+ ident = p._defined_by()
+ for key in ident:
+ req[key].append(ident[key])
+
+ req = api.Request(site=self, action='wbgetentities', **req)
+ data = req.submit()
+ for qid in data['entities']:
+ item = pywikibot.ItemPage(self, qid)
+ item._content = data['entities'][qid]
+ item.get() # This parses the json and preloads the various properties
+ yield item
+
def getPropertyType(self, prop):
"""
This is used sepecifically because we can cache
diff --git a/tests/site_tests.py b/tests/site_tests.py
index cb29a0e..bf9e33f 100644
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -202,6 +202,15 @@
if count >= 5:
break
+ def testItemPreload(self):
+ """Test that ItemPage preloading works"""
+
+ datasite = mysite.data_repository()
+
+ items = [pywikibot.ItemPage(datasite, 'q' + str(num)) for num in range(1, 11)]
+ for page in datasite.preloaditempages(items):
+ self.assertTrue(hasattr(page, '_content'))
+
def testLinkMethods(self):
"""Test site methods for getting links to and from a page"""
--
To view, visit https://gerrit.wikimedia.org/r/80789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I05917eb982f41dcdc92d8e45292ba6c27eac47f7
Gerrit-PatchSet: 5
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com>
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
jenkins-bot has submitted this change and it was merged.
Change subject: Assume utf-8 encoding for password file
......................................................................
Assume utf-8 encoding for password file
Change-Id: I7fe9fe9842cdb61b8ecb373a2c071b2def54bff2
---
M pywikibot/login.py
1 file changed, 8 insertions(+), 4 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/login.py b/pywikibot/login.py
index e5b9f97..49cebaa 100644
--- a/pywikibot/login.py
+++ b/pywikibot/login.py
@@ -126,22 +126,26 @@
DO NOT FORGET TO REMOVE READ ACCESS FOR OTHER USERS!!!
Use chmod 600 password-file.
+
All lines below should be valid Python tuples in the form
(code, family, username, password) or (username, password)
to set a default password for an username. Default usernames
should occur above specific usernames.
+ If the username or password contain non-ascii characters, they
+ should be stored using the utf-8 encoding.
+
Example:
- ("my_username", "my_default_password")
- ("my_sysop_user", "my_sysop_password")
- ("en", "wikipedia", "my_en_user", "my_en_pass")
+ (u"my_username", u"my_default_password")
+ (u"my_sysop_user", u"my_sysop_password")
+ (u"en", u"wikipedia", u"my_en_user", u"my_en_pass")
"""
password_f = open(config.password_file)
for line in password_f:
if not line.strip():
continue
- entry = eval(line)
+ entry = eval(line.decode('utf-8'))
if len(entry) == 2: # for default userinfo
if entry[0] == self.username:
self.password = entry[1]
--
To view, visit https://gerrit.wikimedia.org/r/81520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7fe9fe9842cdb61b8ecb373a2c071b2def54bff2
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Toto Azéro <totoazero(a)yahoo.fr>
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: Toto Azéro <totoazero(a)yahoo.fr>
Gerrit-Reviewer: jenkins-bot
Legoktm has submitted this change and it was merged.
Change subject: Support to add a reference with multiple claims.
......................................................................
Support to add a reference with multiple claims.
site.editSource() accepts now either a single claim
(=backward-compatible) for a single claim reference
or a list of claims for a multi claim reference
page.addSources() is new and takes a list of claims
in contrast to page.addSource()
Claim.sources is a list of dicts now. Thus, it is possible
to check if a property is contained.
Change-Id: Iac583043531ba3f30985244ffad2aef2ad549f51
---
M pywikibot/page.py
M pywikibot/site.py
2 files changed, 65 insertions(+), 34 deletions(-)
Approvals:
Legoktm: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 8816da2..bb87d46 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):
@@ -2741,9 +2741,15 @@
bit differently, and require some
more handling.
"""
- mainsnak = data['snaks'].values()[0][0]
- wrap = {'mainsnak': mainsnak, 'hash': data['hash']}
- return Claim.fromJSON(site, wrap)
+ source = {}
+ for prop in data['snaks'].values():
+ for claimsnak in prop:
+ claim = Claim.fromJSON(site, {'mainsnak': claimsnak, 'hash': data['hash']})
+ if claim.getID() in source:
+ source[claim.getID()].append(claim)
+ else:
+ source[claim.getID()] = [claim]
+ return source
@staticmethod
def qualifierFromJSON(site, data):
@@ -2754,7 +2760,6 @@
"""
wrap = {'mainsnak': data}
return Claim.fromJSON(site, wrap)
-
def setTarget(self, value):
"""
@@ -2815,18 +2820,33 @@
def getSources(self):
"""
- Returns a list of Claims
+ Returns a list of sources. Each source is a list of Claims.
"""
return self.sources
- def addSource(self, source, **kwargs):
+ def addSource(self, claim, **kwargs):
"""
- source is a Claim.
- adds it as a reference.
+ Adds the claim as a source.
+ @param claim: the claim to add
+ @type claim: pywikibot.Claim
"""
- data = self.repo.editSource(self, source, new=True, **kwargs)
- source.hash = data['reference']['hash']
- self.on_item.lastrevid = data['pageinfo']['lastrevid']
+ self.addSources([claim], **kwargs)
+
+ def addSources(self, claims, **kwargs):
+ """
+ Adds the claims as one source.
+ @param claims: the claims to add
+ @type claims: list of pywikibot.Claim
+ """
+ data = self.repo.editSource(self, claims, new=True, **kwargs)
+ source = {}
+ for claim in claims:
+ claim.hash = data['reference']['hash']
+ self.on_item.lastrevid = data['pageinfo']['lastrevid']
+ if claim.getID() in source:
+ source[claim.getID()].append(claim)
+ else:
+ source[claim.getID()] = [claim]
self.sources.append(source)
def _formatDataValue(self):
@@ -2845,8 +2865,6 @@
else:
raise NotImplementedError('%s datatype is not supported yet.' % self.getType())
return value
-
-
class Revision(object):
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 4e5dfaf..2d8142e 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -3385,7 +3385,7 @@
"""get the data for multiple Wikibase items"""
if type(source) == int or \
isinstance(source, basestring) and source.isdigit():
- ids = 'q'+str(source)
+ ids = 'q' + str(source)
wbrequest = api.Request(site=self, action="wbgetentities", ids=ids,
**params)
wbdata = wbrequest.submit()
@@ -3435,7 +3435,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
@@ -3535,25 +3535,38 @@
if bot:
params['bot'] = 1
params['token'] = self.token(claim, 'edit')
- if not new and hasattr(source, 'hash'):
- params['reference'] = source.hash
#build up the snak
- if source.getType() == 'wikibase-item':
- datavalue = {'type': 'wikibase-entityid',
- 'value': source._formatDataValue(),
- }
- elif source.getType() == 'string':
- datavalue = {'type': 'string',
- 'value': source._formatDataValue(),
- }
+ if isinstance(source, list):
+ sources = source
else:
- raise NotImplementedError('%s datatype is not supported yet.' % claim.getType())
- snak = {source.getID(): [{'snaktype': 'value',
- 'property': source.getID(),
- 'datavalue': datavalue,
- },
- ],
- }
+ sources = [source]
+
+ snak = {}
+ for sourceclaim in sources:
+ if sourceclaim.getType() == 'wikibase-item':
+ datavalue = {'type': 'wikibase-entityid',
+ 'value': sourceclaim._formatDataValue(),
+ }
+ elif sourceclaim.getType() == 'string':
+ datavalue = {'type': 'string',
+ 'value': sourceclaim._formatDataValue(),
+ }
+ else:
+ raise NotImplementedError('%s datatype is not supported yet.' % sourceclaim.getType())
+ valuesnaks = []
+ if sourceclaim.getID() in snak:
+ valuesnaks = snak[sourceclaim.getID()]
+ valuesnaks.append({'snaktype': 'value',
+ 'property': sourceclaim.getID(),
+ 'datavalue': datavalue,
+ },
+ )
+
+ snak[sourceclaim.getID()] = valuesnaks
+ # set the hash if the source should be changed. if present, all claims of one source have the same hash
+ if not new and hasattr(sourceclaim, 'hash'):
+ params['reference'] = sourceclaim.hash
+
params['snaks'] = json.dumps(snak)
for arg in kwargs:
if arg in ['bot', 'lastrevid']:
--
To view, visit https://gerrit.wikimedia.org/r/81219
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac583043531ba3f30985244ffad2aef2ad549f51
Gerrit-PatchSet: 7
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: FelixReimann <felix(a)fex-it.de>
Gerrit-Reviewer: FelixReimann <felix(a)fex-it.de>
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: Multichill <maarten(a)mdammers.nl>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change and it was merged.
Change subject: pwb_tests: set PYWIKIBOT2_DIR from base_dir
......................................................................
pwb_tests: set PYWIKIBOT2_DIR from base_dir
If the tests are run from setup.py test without PYWIKIBOT2_DIR set,
it will use base_dir='~/.pywikibot'. This is OK for all tests, except
when calling pwb.py -- which will assume base_dir is the checkout dir
instead, and thus ask for information to create a new user-config.py.
This commit makes sure PYWIKIBOT2_DIR is set to base_dir (='~/.pywikibot')
before calling pwb.py, which will make pwb.py check that directory instead.
Change-Id: I0a277425b4f9df5b64c325b7d2712f4ba007a260
Fixes-Change-Id: Ic8522e1f08c359fff4085c172e696e62ca969a70
Fixes-Change-Id: Iaeaaf1b34d3e2bcacf8308d2c3b74bd8f711ec6a
Fixes-Change-Id: If9458fca50f07f08441dbb6e06f78bdbae2065de
---
M tests/pwb_tests.py
1 file changed, 10 insertions(+), 4 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py
index 5a97483..506b02f 100644
--- a/tests/pwb_tests.py
+++ b/tests/pwb_tests.py
@@ -12,17 +12,23 @@
import unittest
+import pywikibot
+
pypath = sys.executable
basepath = os.path.split(os.path.split(__file__)[0])[0]
pwbpath = os.path.join(basepath, 'pwb.py')
testbasepath = os.path.join(basepath, 'tests', 'pwb')
class TestPwb(unittest.TestCase):
- @unittest.skip("""Skipping test due to broken Travis run.
+ def setUp(self):
+ self.oldenviron = os.environ.copy()
+ os.environ['PYWIKIBOT2_DIR'] = pywikibot.config.base_dir
-Probably the shelling out causes an issue, but we have to investigate this.
-See https://gerrit.wikimedia.org/r/#/c/76486/ and
- https://gerrit.wikimedia.org/r/#/c/82370/ for details. """)
+ def tearDown(self):
+ del os.environ['PYWIKIBOT2_DIR']
+ if 'PYWIKIBOT2_DIR' in self.oldenviron:
+ os.environ['PYWIKIBOT2_DIR'] = self.oldenviron['PYWIKIBOT2_DIR']
+
def testScriptEnvironment(self):
"""Make sure the environment is not contaminated, and is the same as
the environment we get when directly running a script."""
--
To view, visit https://gerrit.wikimedia.org/r/82425
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0a277425b4f9df5b64c325b7d2712f4ba007a260
Gerrit-PatchSet: 1
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
jenkins-bot has submitted this change and it was merged.
Change subject: Fix 'Disable pwb_tests to prevent Travis build failures'
......................................................................
Fix 'Disable pwb_tests to prevent Travis build failures'
Now with actual closing bracket.
Change-Id: Ic8522e1f08c359fff4085c172e696e62ca969a70
Fixes-Change-Id: Iaeaaf1b34d3e2bcacf8308d2c3b74bd8f711ec6a
---
M tests/pwb_tests.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py
index af44203..5a97483 100644
--- a/tests/pwb_tests.py
+++ b/tests/pwb_tests.py
@@ -22,7 +22,7 @@
Probably the shelling out causes an issue, but we have to investigate this.
See https://gerrit.wikimedia.org/r/#/c/76486/ and
- https://gerrit.wikimedia.org/r/#/c/82370/ for details. """
+ https://gerrit.wikimedia.org/r/#/c/82370/ for details. """)
def testScriptEnvironment(self):
"""Make sure the environment is not contaminated, and is the same as
the environment we get when directly running a script."""
--
To view, visit https://gerrit.wikimedia.org/r/82422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8522e1f08c359fff4085c172e696e62ca969a70
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change and it was merged.
Change subject: Disable pwb_tests to prevent Travis build failures
......................................................................
Disable pwb_tests to prevent Travis build failures
I'm fairly certain this is a testing issue related to shelling
out, or possibly to environment variables. However, the test
passes for me, so I think the most reasonable option for now
is to disable the test and then to see why Travis fails.
Change-Id: Iaeaaf1b34d3e2bcacf8308d2c3b74bd8f711ec6a
---
M tests/pwb_tests.py
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py
index 4cb9759..af44203 100644
--- a/tests/pwb_tests.py
+++ b/tests/pwb_tests.py
@@ -18,6 +18,11 @@
testbasepath = os.path.join(basepath, 'tests', 'pwb')
class TestPwb(unittest.TestCase):
+ @unittest.skip("""Skipping test due to broken Travis run.
+
+Probably the shelling out causes an issue, but we have to investigate this.
+See https://gerrit.wikimedia.org/r/#/c/76486/ and
+ https://gerrit.wikimedia.org/r/#/c/82370/ for details. """
def testScriptEnvironment(self):
"""Make sure the environment is not contaminated, and is the same as
the environment we get when directly running a script."""
--
To view, visit https://gerrit.wikimedia.org/r/82370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaeaaf1b34d3e2bcacf8308d2c3b74bd8f711ec6a
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change and it was merged.
Change subject: Fix and document parameters that Site.newpages was passing to Site.recentchanges
......................................................................
Fix and document parameters that Site.newpages was passing to Site.recentchanges
Also added type hinting to the various parameters.
Change-Id: Icbc9f988a6c533788f1d1d9867411eda901017c2
---
M pywikibot/site.py
1 file changed, 22 insertions(+), 1 deletion(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 1b1f1d6..1c0b144 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -2242,29 +2242,43 @@
namespaces=None, pagelist=None, changetype=None,
showMinor=None, showBot=None, showAnon=None,
showRedirects=None, showPatrolled=None, topOnly=False,
- step=None, total=None):
+ step=None, total=None, user=None, excludeuser=None):
"""Iterate recent changes.
@param start: Timestamp to start listing from
+ @type start: pywikibot.Timestamp
@param end: Timestamp to end listing at
+ @type end: pywikibot.Timestamp
@param reverse: if True, start with oldest changes (default: newest)
+ @type reverse: bool
@param pagelist: iterate changes to pages in this list only
@param pagelist: list of Pages
@param changetype: only iterate changes of this type ("edit" for
edits to existing pages, "new" for new pages, "log" for log
entries)
+ @type changetype: basestring
@param showMinor: if True, only list minor edits; if False (and not
None), only list non-minor edits
+ @type showMinor: bool
@param showBot: if True, only list bot edits; if False (and not
None), only list non-bot edits
+ @type showBot: bool
@param showAnon: if True, only list anon edits; if False (and not
None), only list non-anon edits
+ @type showAnon: bool
@param showRedirects: if True, only list edits to redirect pages; if
False (and not None), only list edits to non-redirect pages
+ @type showRedirects: bool
@param showPatrolled: if True, only list patrolled edits; if False
(and not None), only list non-patrolled edits
+ @type showPatrolled: bool
@param topOnly: if True, only list changes that are the latest revision
(default False)
+ @type topOnly: bool
+ @param user: if not None, only list edits by this user or users
+ @type user: basestring|list
+ @param excludeuser: if not None, exclude edits by this user or users
+ @type excludeuser: basestring|list
"""
if start and end:
@@ -2312,6 +2326,13 @@
rcshow.append(filters[item] and item or ("!" + item))
if rcshow:
rcgen.request["rcshow"] = "|".join(rcshow)
+
+ if user:
+ rcgen.request['rcuser'] = user
+
+ if excludeuser:
+ rcgen.request['rcexcludeuser'] = excludeuser
+
return rcgen
@deprecate_arg("number", "limit")
--
To view, visit https://gerrit.wikimedia.org/r/82220
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icbc9f988a6c533788f1d1d9867411eda901017c2
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipedia(a)gmail.com>
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
Xqt has submitted this change and it was merged.
Change subject: Updated pwb.py to better mirror direct script runs
......................................................................
Updated pwb.py to better mirror direct script runs
Before, execfile() ran the script in environment that pwb.py has, which
included os and path imports, and several other variables.
This commit uses run_python_file from Ned Batchelors' coverage.py [1],
available under the BSD license [2]. See also his blog posts on the
subject [3,4].
This commit also adds a test that shells out to compare the locals()
for runs through pwb.py as well as to a script directly.
After this change, the effects of changeset 76484 can be seen using pwb.py
[1] https://bitbucket.org/ned/coveragepy/src/b5abcee50dbe/coverage/execfile.py
[2] https://bitbucket.org/ned/coveragepy/src/2c5fb3a8b81cc56d8ad57dd1bd83ef7740…
[3] http://nedbatchelder.com/blog/200904/running_a_python_file_as_main.html
[4] http://nedbatchelder.com/blog/200905/running_a_python_file_as_main_take_2.h…
Change-Id: If9458fca50f07f08441dbb6e06f78bdbae2065de
---
M pwb.py
A tests/pwb/print_locals.py
A tests/pwb_tests.py
3 files changed, 89 insertions(+), 13 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pwb.py b/pwb.py
index ae732ed..94fef0c 100644
--- a/pwb.py
+++ b/pwb.py
@@ -12,8 +12,50 @@
# Distributed under the terms of the MIT license.
#
-import sys
+
+# The following snippet was developed by Ned Batchelder (and others)
+# for coverage.py [1], and is available under the BSD license (see [2])
+# [1] https://bitbucket.org/ned/coveragepy/src/b5abcee50dbe/coverage/execfile.py
+# [2] https://bitbucket.org/ned/coveragepy/src/2c5fb3a8b81cc56d8ad57dd1bd83ef7740…
+
+import imp
import os
+import sys
+
+
+def run_python_file(filename, args):
+ """Run a python file as if it were the main program on the command line.
+
+ `filename` is the path to the file to execute, it need not be a .py file.
+ `args` is the argument array to present as sys.argv, including the first
+ element representing the file being executed.
+
+ """
+ # Create a module to serve as __main__
+ old_main_mod = sys.modules['__main__']
+ main_mod = imp.new_module('__main__')
+ sys.modules['__main__'] = main_mod
+ main_mod.__file__ = filename
+ main_mod.__builtins__ = sys.modules['__builtin__']
+
+ # Set sys.argv and the first path element properly.
+ old_argv = sys.argv
+ old_path0 = sys.path[0]
+ sys.argv = args
+ sys.path[0] = os.path.dirname(filename)
+
+ try:
+ source = open(filename).read()
+ exec compile(source, filename, "exec") in main_mod.__dict__
+ finally:
+ # Restore the old __main__
+ sys.modules['__main__'] = old_main_mod
+
+ # Restore the old argv and path
+ sys.argv = old_argv
+ sys.path[0] = old_path0
+
+#### end of snippet
if sys.version_info[0] != 2:
raise RuntimeError("ERROR: Pywikipediabot only runs under Python 2")
@@ -33,21 +75,20 @@
os.environ["PYWIKIBOT2_DIR"] = os.path.split(__file__)[0]
if not os.path.exists(os.path.join(os.environ["PYWIKIBOT2_DIR"], "user-config.py")):
- execfile('generate_user_files.py')
+ run_python_file('generate_user_files.py', ['generate_user_files.py'])
-sys.argv.pop(0)
-if len(sys.argv) > 0:
- if not os.path.exists(sys.argv[0]):
- testpath = os.path.join(os.path.split(__file__)[0], 'scripts', sys.argv[0])
+if len(sys.argv) > 1:
+ fn = sys.argv[1]
+ args = sys.argv[1:]
+
+ if not os.path.exists(fn):
+ testpath = os.path.join(os.path.split(__file__)[0], 'scripts', fn)
if os.path.exists(testpath):
- sys.argv[0] = testpath
+ fn = testpath
else:
testpath = testpath + '.py'
if os.path.exists(testpath):
- sys.argv[0] = testpath
+ fn = testpath
else:
- raise Exception("%s not found!" % sys.argv[0])
- sys.path.append(os.path.split(sys.argv[0])[0])
- execfile(sys.argv[0])
-else:
- sys.argv.append('')
+ raise Exception("%s not found!" % fn)
+ run_python_file(fn, args)
diff --git a/tests/pwb/print_locals.py b/tests/pwb/print_locals.py
new file mode 100644
index 0000000..1b84ac0
--- /dev/null
+++ b/tests/pwb/print_locals.py
@@ -0,0 +1,4 @@
+"""docstring"""
+
+for k,v in locals().copy().iteritems():
+ print repr(k), ":", repr(v)
diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py
new file mode 100644
index 0000000..4cb9759
--- /dev/null
+++ b/tests/pwb_tests.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+#
+# (C) Pywikipedia bot team, 2007
+#
+# Distributed under the terms of the MIT license.
+#
+__version__ = '$Id$'
+
+import os
+import sys
+import subprocess
+
+import unittest
+
+pypath = sys.executable
+basepath = os.path.split(os.path.split(__file__)[0])[0]
+pwbpath = os.path.join(basepath, 'pwb.py')
+testbasepath = os.path.join(basepath, 'tests', 'pwb')
+
+class TestPwb(unittest.TestCase):
+ def testScriptEnvironment(self):
+ """Make sure the environment is not contaminated, and is the same as
+ the environment we get when directly running a script."""
+ test = os.path.join(testbasepath, 'print_locals.py')
+
+ direct = subprocess.check_output([pypath, test])
+ vpwb = subprocess.check_output([pypath, pwbpath, test])
+ self.assertEqual(direct, vpwb)
+
+if __name__=="__main__":
+ unittest.main(verbosity=10)
--
To view, visit https://gerrit.wikimedia.org/r/76486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If9458fca50f07f08441dbb6e06f78bdbae2065de
Gerrit-PatchSet: 6
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: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Xqt has submitted this change and it was merged.
Change subject: Set correct language as source
......................................................................
Set correct language as source
Patch is basically the same as d90be6a8765.
Bug: https://sourceforge.net/p/pywikipediabot/feature-requests/346/
Change-Id: Ic2a6010903a3586803687f350f95ce33fa6abbb2
---
M scripts/claimit.py
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/claimit.py b/scripts/claimit.py
index 02bdf35..0f50db0 100755
--- a/scripts/claimit.py
+++ b/scripts/claimit.py
@@ -37,15 +37,15 @@
self.setSource(pywikibot.Site().language())
def setSource(self, lang):
- '''
+ """
Get the source
- '''
+ """
page = pywikibot.Page(self.repo, 'Wikidata:List of wikis/python')
source_values = json.loads(page.get())
source_values = source_values['wikipedia']
- for lang in source_values:
- source_values[lang] = pywikibot.ItemPage(self.repo,
- source_values[lang])
+ for source_lang in source_values:
+ source_values[source_lang] = pywikibot.ItemPage(self.repo,
+ source_values[source_lang])
if lang in source_values:
self.source = pywikibot.Claim(self.repo, 'p143')
--
To view, visit https://gerrit.wikimedia.org/r/82106
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2a6010903a3586803687f350f95ce33fa6abbb2
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: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot