don't need to have an account on mediawiki

This commit is contained in:
Romain Bignon 2011-02-19 18:54:26 +01:00
commit 10beaf2c5d
2 changed files with 18 additions and 22 deletions

View file

@ -28,13 +28,14 @@ __all__ = ['MediawikiBackend']
class MediawikiBackend(BaseBackend, ICapContent):
NAME = 'mediawiki'
MAINTAINER = u'Clément Schreiner'
EMAIL = '0.6'
EMAIL = 'clemux@clemux.info'
VERSION = '0.6'
LICENSE = 'GPLv3'
DESCRIPTION = 'Mediawiki wiki software application'
CONFIG = ValuesDict(Value('url', label='URL of the Mediawiki website'),
Value('apiurl', label='URL of the Mediawiki website\'s API'),
Value('username', label='Login'),
Value('password', label='Password', masked=True))
Value('username', label='Login', default=''),
Value('password', label='Password', default='', masked=True))
BROWSER = MediawikiBrowser
def create_default_browser(self):
@ -54,7 +55,6 @@ class MediawikiBackend(BaseBackend, ICapContent):
for rev in self.browser.iter_wiki_revisions(_id, max_results):
yield rev
def push_content(self, content, message=None, minor=False):
self.browser.set_wiki_source(content, message, minor)

View file

@ -70,7 +70,7 @@ class MediawikiBrowser(BaseBrowser):
def get_token(self, page, _type):
''' _type can be edit, delete, protect, move, block, unblock, email or import'''
if not self.is_logged():
if len(self.username) > 0 and not self.is_logged():
self.login()
data = {'action': 'query',
@ -86,7 +86,7 @@ class MediawikiBrowser(BaseBrowser):
def set_wiki_source(self, content, message=None, minor=False):
if not self.is_logged():
if len(self.username) > 0 and not self.is_logged():
self.login()
page = content.id
@ -112,8 +112,6 @@ class MediawikiBrowser(BaseBrowser):
result = self.API_post(data)
return result['parse']['text']['*']
def is_logged(self):
data = {'action': 'query',
'meta': 'userinfo',
@ -132,7 +130,7 @@ class MediawikiBrowser(BaseBrowser):
}
result = self.API_post(data)
if result['login']['result'] == 'WrongPass':
raise BrowserIncorrectPassword
raise BrowserIncorrectPassword()
if result['login']['result'] == 'NeedToken':
data['lgtoken'] = result['login']['token']
@ -140,7 +138,7 @@ class MediawikiBrowser(BaseBrowser):
def iter_wiki_revisions(self, page, nb_entries):
'''Yield 'Revision' objects for the last <nb_entries> revisions of the specified page.'''
if not self.is_logged():
if len(self.username) > 0 and not self.is_logged():
self.login()
data = {'action': 'query',
'titles': page,
@ -164,8 +162,6 @@ class MediawikiBrowser(BaseBrowser):
rev_content.minor = False
yield rev_content
def home(self):
'''We don't need to change location, we're using the JSON API here.'''
pass