diff --git a/mwclient/compatibility.py b/mwclient/compatibility.py index 7be9383a99266f51d5fe674a0c454b73829ed3d8..65392aad8d50b18959a88786696f3271b827b015 100644 --- a/mwclient/compatibility.py +++ b/mwclient/compatibility.py @@ -1,8 +1,8 @@ -def title(prefix, compatible): - if compatible: - return 'title' - else: +def title(prefix, new_format): + if new_format: return prefix + 'title' + else: + return 'titles' def userinfo(data, new_format): if new_format: diff --git a/mwclient/page.py b/mwclient/page.py index 967e504e77ac9bd0a5b2fc0464a63890255815a3..1e6ac1a014799875ce62a10b298a3e6a3e3e609e 100644 --- a/mwclient/page.py +++ b/mwclient/page.py @@ -1,4 +1,5 @@ import client, errors, listing +import compatibility from HTMLParser import HTMLParser from htmlentitydefs import name2codepoint import urllib, time @@ -180,9 +181,11 @@ class Page(object): self.site.require(1, 9) # Fix title for < 1.11 !! prefix = listing.List.get_prefix('bl', generator) - kwargs = dict(listing.List.generate_kwargs(prefix, title = self.name, + kwargs = dict(listing.List.generate_kwargs(prefix, namespace = namespace, filterredir = filterredir)) if redirect: kwargs['%sredirect' % prefix] = '1' + kwargs[compatibility.title(prefix, self.site.require(1, 11))] = self.name + return listing.List.get_list(generator)(self.site, 'backlinks', 'bl', limit = limit, return_values = 'title', **kwargs) def categories(self, generator = True): self.site.require(1, 11) @@ -195,9 +198,11 @@ class Page(object): self.site.require(1, 9) # Fix title for < 1.11 !! prefix = listing.List.get_prefix('ei', generator) - kwargs = dict(listing.List.generate_kwargs(prefix, title = self.name, + kwargs = dict(listing.List.generate_kwargs(prefix, namespace = namespace, filterredir = filterredir)) if redirect: kwargs['%sredirect' % prefix] = '1' + kwargs[compatibility.title(prefix, self.site.require(1, 11))] = self.name + return listing.List.get_list(generator)(self.site, 'embeddedin', 'ei', limit = limit, return_values = 'title', **kwargs) def extlinks(self): self.site.require(1, 11)