From 9dc7f45048cc7222f8c7dc703877f56421c44e2f Mon Sep 17 00:00:00 2001
From: Bryan Tong Minh <bryan.tongminh@gmail.com>
Date: Tue, 5 Feb 2008 13:52:05 +0000
Subject: [PATCH] More
---
mwclient/client.py | 8 ++++++--
mwclient/page.py | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/mwclient/client.py b/mwclient/client.py
index b7df6ad..fcd5d00 100644
--- a/mwclient/client.py
+++ b/mwclient/client.py
@@ -352,7 +352,7 @@ class Site(object):
kwargs = dict(listing.List.generate_kwargs(pfx, ('from', start), prefix = prefix, dir = dir))
return listing.List.get_list(generator)(self, 'allcategories', 'ac', limit = limit, **kwargs)
- def allusers(self, start = None, prefix = None, group = None, prop = '', limit = None):
+ def allusers(self, start = None, prefix = None, group = None, prop = None, limit = None):
self.require(1, 11)
kwargs = dict(listing.List.generate_kwargs('au', ('from', start), prefix = prefix,
@@ -379,7 +379,7 @@ class Site(object):
kwargs = dict(listing.List.generate_kwargs('eu', query = query, prop = prop,
protocol = protocol, namespace = namespace))
return listing.List(self, 'exturlusage', 'eu', limit = limit, **kwargs)
- def logevents(self, prop = None, type = None, start = None, end = None,
+ def logevents(self, type = None, prop = None, start = None, end = None,
dir = 'older', user = None, title = None, limit = None):
self.require(1, 9)
@@ -412,6 +412,10 @@ class Site(object):
kwargs = dict(listing.List.generate_kwargs('uc', user = user, start = start, end = end,
dir = dir, namespace = namespace, prop = prop, show = show))
return listing.List(self, 'usercontribs', 'uc', limit = limit, **kwargs)
+ def users(self, users, prop = 'blockinfo|groups|editcount'):
+ self.require(1, 12)
+
+ return listing.List(self, 'users', 'us', ususers = '|'.join(users), usprop = prop)
def watchlist(self, allrev = False, start = None, end = None, namespace = None, dir = 'older',
prop = None, show = None, limit = None):
diff --git a/mwclient/page.py b/mwclient/page.py
index 503d50f..641ad9f 100644
--- a/mwclient/page.py
+++ b/mwclient/page.py
@@ -198,7 +198,7 @@ class Page(object):
kwargs = dict(listing.List.generate_kwargs(prefix, title = self.name,
namespace = namespace, filterredir = filterredir))
if redirect: kwargs['%sredirect' % prefix] = '1'
- return listing.List.get_list(generator)('embeddedin', 'ei', limit = limit, return_values = 'title', **kwargs)
+ return listing.List.get_list(generator)(self.site, 'embeddedin', 'ei', limit = limit, return_values = 'title', **kwargs)
def extlinks(self):
self.site.require(1, 11)
return listing.PageProperty(self, 'extlinks', 'el', return_values = '*')
--
GitLab