Revert to r24

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):
+		
\ No newline at end of file
-	if version[:2] >= (1, 13):
-		return 'editprotected'
-	else:
-		return 'protect'
\ No newline at end of file

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)