From b41fe657bff772c115147bc331b8ce6c38f4a1f3 Mon Sep 17 00:00:00 2001
From: Bryan Tong Minh <bryan.tongminh@gmail.com>
Date: Thu, 28 Feb 2008 12:21:17 +0000
Subject: [PATCH] Revert to r24
---
mwclient/compatibility.py | 11 +++--------
mwclient/page.py | 8 ++++----
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/mwclient/compatibility.py b/mwclient/compatibility.py
index 80a0105..ded741a 100644
--- a/mwclient/compatibility.py
+++ b/mwclient/compatibility.py
@@ -18,8 +18,8 @@ def userinfo(data, new_format = None):
else:
return data['userinfo']
-def iiprop(version):
- if version[:2] >= (1, 12):
+def iiprop(post_112):
+ if post_112:
return 'timestamp|user|comment|url|size|sha1|metadata'
else:
return 'timestamp|user|comment|url|size|sha1'
@@ -29,9 +29,4 @@ def cmtitle(page, new_format, prefix = ''):
return prefix + 'title', page.name
else:
return prefix + 'category', page.strip_namespace(page.name)
-
-def protectright(version):
- if version[:2] >= (1, 13):
- return 'editprotected'
- else:
- return 'protect'
\ No newline at end of file
+
\ No newline at end of file
diff --git a/mwclient/page.py b/mwclient/page.py
index 605ba10..e41b1b8 100644
--- a/mwclient/page.py
+++ b/mwclient/page.py
@@ -64,7 +64,7 @@ class Page(object):
def can(self, action):
level = self.protection.get(action, (action, ))[0]
- if level == 'sysop': level = compatibility.protectright(site.version)
+ if level == 'sysop': level = 'protect'
return level in self.site.rights
@@ -247,14 +247,14 @@ class Image(Page):
def __init__(self, site, name, info = None):
site.require(1, 11)
Page.__init__(self, site, name, info,
- extra_properties = {'imageinfo': (('iiprop',
- compatibility.iiprop(site.version)), )})
+ extra_properties = {'imageinfo': (('iiprop', compatibility.iiprop(
+ site.require(1, 12, raise_error = False))), )})
self.imagerepository = self._info.get('imagerepository', '')
self.imageinfo = self._info.get('imageinfo', ((), ))[0]
def imagehistory(self):
return listing.PageProperty(self, 'imageinfo', 'ii',
- iiprop = compatibility.iiprop(site.version))
+ iiprop = compatibility.iiprop(self.site.require(1, 12, raise_error = False)))
def imageusage(self, namespace = None, filterredir = 'all', redirect = False,
limit = None, generator = True):
self.site.require(1, 11)
--
GitLab