Mercurial > moin-moose
changeset 1:c4f16b220541 default tip
Worked around API changes in 1.6
| author | Radomir Dopieralski <devel@sheep.art.pl> |
|---|---|
| date | Wed, 14 May 2008 09:31:56 +0200 |
| parents | b57d88841bf6 |
| children | |
| files | moose.py |
| diffstat | 1 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/moose.py Wed May 14 09:20:55 2008 +0200 +++ b/moose.py Wed May 14 09:31:56 2008 +0200 @@ -261,7 +261,10 @@ """ request = self.request _ = request.getText - preferencesPage = wikiutil.getSysPage(request, 'UserPreferences') + try: + preferencesPage = wikiutil.getSysPage(request, 'UserPreferences') + except AttributeError: + preferencesPage = wikiutil.getLocalizedPage(request, 'UserPreferences') userlinks = [] # Add username/homepage link for registered users. We don't care @@ -276,7 +279,7 @@ homelink = (request.formatter.interwikilink(1, title=title, *interwiki) + request.formatter.text(name) + request.formatter.interwikilink(0)) - userlinks.append(homelink) + userlinks.append(homelink) # Set pref page to localized Preferences page title = preferencesPage.split_title(request) userlinks.append(preferencesPage.link_to(request, text=title)) @@ -305,7 +308,7 @@ """ _ = self.request.getText content = [] - if d['title_link']: # having a link means we have a (linked) pagename ONLY as title, not a message title + if 'title_link' in d and d['title_link']: # having a link means we have a (linked) pagename ONLY as title, not a message title # XXX this method is rather ugly and should be improved curpage = '' segments = d['page_name'].split('/') # was: title_text @@ -355,12 +358,15 @@ page = d['page'] available = request.getAvailableActions(page) if available: - available = available.keys() + available = list(available) available.sort() for action in available: # Always add spaces: AttachFile -> Attach File # XXX TODO do not make a page object just for split_title - title = Page(request, action).split_title(request, force=1) + try: + title = Page(request, action).split_title(request, force=1) + except TypeError: + title = Page(request, action).split_title(force=1) # Use translated version if available title = _(title, formatted=False) params = '%s?action=%s' % (d['q_page_name'], action)