Mercurial > moin > 1.9
changeset 949:cbbde07e00c4
whitespace-only cleanup, small style changes
author | Thomas Waldmann <tw AT waldmann-edv DOT de> |
---|---|
date | Mon, 17 Jul 2006 04:01:34 +0200 |
parents | 28ea5b3802b1 |
children | 4eb66637ccd0 |
files | MoinMoin/action/Despam.py MoinMoin/action/LikePages.py MoinMoin/action/LocalSiteMap.py MoinMoin/action/MyPages.py MoinMoin/action/PackagePages.py MoinMoin/action/RenamePage.py MoinMoin/action/SpellCheck.py MoinMoin/action/SubscribeUser.py MoinMoin/action/backup.py MoinMoin/action/fckdialog.py MoinMoin/action/fullsearch.py MoinMoin/action/login.py MoinMoin/action/logout.py MoinMoin/action/newpage.py MoinMoin/action/sitemap.py MoinMoin/action/test.py MoinMoin/action/thread_monitor.py |
diffstat | 17 files changed, 95 insertions(+), 95 deletions(-) [+] |
line wrap: on
line diff
--- a/MoinMoin/action/Despam.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/Despam.py Mon Jul 17 04:01:34 2006 +0200 @@ -94,7 +94,7 @@ def revert_page(request, pagename, editor): if not request.user.may.revert(pagename): - return + return log = editlog.EditLog(request, rootpagename=pagename)
--- a/MoinMoin/action/LikePages.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/LikePages.py Mon Jul 17 04:01:34 2006 +0200 @@ -30,13 +30,13 @@ # No matches if not matches: Page(request, pagename).send_page(request, - msg = _('No pages like "%s"!') % (pagename,)) + msg=_('No pages like "%s"!') % (pagename,)) return # One match - display it if len(matches) == 1: Page(request, matches.keys()[0]).send_page(request, - msg = _('Exactly one page like "%s" found, redirecting to page.') % ( + msg=_('Exactly one page like "%s" found, redirecting to page.') % ( pagename,)) return @@ -47,7 +47,7 @@ request.setContentLanguage(request.lang) request.theme.send_title(_('Pages like "%s"') % (pagename), pagename=pagename) - + # Start content - IMPORTANT - without content div, there is no # direction support! request.write(request.formatter.startContent("content")) @@ -99,13 +99,13 @@ # Stop after 10 matches if found == 10: break - + # Filter deleted pages or pages the user can't read from # matches. Order is important! for name in matches.keys(): page = Page(request, name) if not (page.exists() and request.user.may.read(name)): - del matches[name] + del matches[name] # Finally, merge both dicts matches.update(close_matches) @@ -131,11 +131,11 @@ @return: start, end, matches dict """ if start_re is None: - start_re=re.compile('([%s][%s]+)' % (config.chars_upper, - config.chars_lower)) + start_re = re.compile('([%s][%s]+)' % (config.chars_upper, + config.chars_lower)) if end_re is None: - end_re=re.compile('([%s][%s]+)$' % (config.chars_upper, - config.chars_lower)) + end_re = re.compile('([%s][%s]+)$' % (config.chars_upper, + config.chars_lower)) # If we don't get results with wiki words matching, fall back to # simple first word and last word, using spaces. @@ -144,14 +144,14 @@ if match: start = match.group(1) else: - start = words[0] - + start = words[0] + match = end_re.search(pagename) if match: end = match.group(1) else: - end = words[-1] - + end = words[-1] + matches = {} subpage = pagename + '/' @@ -201,7 +201,7 @@ return matches -def showMatches(pagename, request, start, end, matches, show_count = True): +def showMatches(pagename, request, start, end, matches, show_count=True): keys = matches.keys() keys.sort() _showMatchGroup(request, matches, keys, 8, pagename, show_count) @@ -211,7 +211,7 @@ _showMatchGroup(request, matches, keys, 2, "...%s" % (end,), show_count) -def _showMatchGroup(request, matches, keys, match, title, show_count = True): +def _showMatchGroup(request, matches, keys, match, title, show_count=True): _ = request.getText matchcount = matches.values().count(match)
--- a/MoinMoin/action/LocalSiteMap.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/LocalSiteMap.py Mon Jul 17 04:01:34 2006 +0200 @@ -22,7 +22,7 @@ @copyright: 2001-2004 by Jürgen Hermann <jh@web.de> @license: GNU GPL, see COPYING for details. """ - + from MoinMoin import wikiutil from MoinMoin.Page import Page @@ -101,10 +101,10 @@ def new_kids(self, name): # does not recurse kids = [] - for child in Page(self.request, name).getPageLinks(self.request): + for child in Page(self.request, name).getPageLinks(self.request): if self.is_ok(child): kids.append(child) - return kids + return kids def new_node(self): self.numnodes = self.numnodes + 1 @@ -139,7 +139,7 @@ def append(self, node): self.children.append(node) - + def depth_first_visit(self, request, visitor, depth=0): visitor.visit(request, self.node, depth) for c in self.children:
--- a/MoinMoin/action/MyPages.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/MyPages.py Mon Jul 17 04:01:34 2006 +0200 @@ -12,7 +12,7 @@ _ = request.getText thispage = Page(request, pagename) - + if request.user.valid: username = request.user.name else: @@ -28,11 +28,11 @@ wikiurl = wikiutil.mapURL(request, wikiurl) homepageurl = wikiutil.join_wiki(wikiurl, wikitail) request.http_redirect('%s?action=MyPages' % homepageurl) - + homepage = Page(request, username) if not homepage.exists(): return homepage.send_page(request, - msg = _('Please first create a homepage before creating additional pages.')) + msg=_('Please first create a homepage before creating additional pages.')) pagecontent = _("""\ You can add some additional sub pages to your already existing homepage here. @@ -59,11 +59,11 @@ from MoinMoin.Page import Page from MoinMoin.parser.text_moin_wiki import Parser as WikiParser request.http_headers() - + # This action generate data using the user language request.setContentLanguage(request.lang) request.theme.send_title(_('MyPages management', formatted=False), page=homepage) - + # Start content - IMPORTANT - without content div, there is no direction support! request.write(request.formatter.startContent("content")) @@ -71,7 +71,7 @@ p = Page(request, "$$$") request.formatter.setPage(p) parser.format(request.formatter) - + request.write(request.formatter.endContent()) request.theme.send_footer(homepage.page_name) request.theme.send_closing_html()
--- a/MoinMoin/action/PackagePages.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/PackagePages.py Mon Jul 17 04:01:34 2006 +0200 @@ -33,7 +33,7 @@ may = self.request.user.may return (not self.__class__.__name__ in self.request.cfg.actions_excluded and may.write(self.pagename)) - + def render(self): """ Render action @@ -42,7 +42,7 @@ """ _ = self.request.getText form = self.request.form - + if form.has_key('cancel'): # User canceled return self.page.send_page(self.request) @@ -52,7 +52,7 @@ raise ActionError(_('You are not allowed to edit this page.')) elif not self.page.exists(): raise ActionError(_('This page is already deleted or was never created!')) - + self.package() except ActionError, e: return self.page.send_page(self.request, msg=e.args[0]) @@ -62,11 +62,11 @@ _ = self.request.getText form = self.request.form COMPRESSION_LEVEL = zipfile.ZIP_DEFLATED - + # Get new name from form and normalize. pagelist = form.get('pagelist', [u''])[0] packagename = form.get('packagename', [u''])[0] - + if not form.get('submit', [None])[0]: raise ActionError(self.makeform()) @@ -82,10 +82,10 @@ pagelist = ', '.join([getattr(page, "page_name") for page in pages]) target = wikiutil.taintfilename(packagename) - + if not target: raise ActionError(self.makeform(_('Invalid filename "%s"!') % wikiutil.escape(packagename))) - + # get directory, and possibly create it attach_dir = Page(self.request, self.page.page_name).getPagePath("attachments", check_create=1) fpath = os.path.join(attach_dir, target).encode(config.charset) @@ -107,16 +107,16 @@ zi = zipfile.ZipInfo(filename=str(cnt), date_time=datetime.fromtimestamp(timestamp).timetuple()[:6]) zi.compress_type = COMPRESSION_LEVEL zf.writestr(zi, page.get_raw_body().encode("utf-8")) - + script += [packLine(['Print', 'Thank you for using PackagePages!'])] - + zf.writestr(MOIN_PACKAGE_FILE, u"\n".join(script).encode("utf-8")) zf.close() os.chmod(fpath, 0666 & config.umask) _addLogEntry(self.request, 'ATTNEW', self.pagename, target) - + raise ActionError(_("Created the package %s containing the pages %s.") % (wikiutil.escape(target), wikiutil.escape(pagelist))) def makeform(self, error=""): @@ -164,9 +164,10 @@ </tr> </table> </form>''' % d - - return Dialog(self.request, content=form) - + + return Dialog(self.request, content=form) + def execute(pagename, request): """ Glue code for actions """ PackagePages(pagename, request).render() +
--- a/MoinMoin/action/RenamePage.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/RenamePage.py Mon Jul 17 04:01:34 2006 +0200 @@ -30,7 +30,7 @@ def is_allowed(self): may = self.request.user.may return may.write(self.pagename) and may.delete(self.pagename) - + def check_condition(self): _ = self._ if not self.page.exists():
--- a/MoinMoin/action/SpellCheck.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/SpellCheck.py Mon Jul 17 04:01:34 2006 +0200 @@ -109,7 +109,7 @@ # no new words checked return newwords = u' '.join(newwords) - + # get the page contents lsw_page = PageEditor(request, request.cfg.page_local_spelling_words) words = lsw_page.get_raw_body() @@ -168,7 +168,7 @@ if badwords: badwords = badwords.keys() - badwords.sort(lambda x,y: cmp(x.lower(), y.lower())) + badwords.sort(lambda x, y: cmp(x.lower(), y.lower())) # build regex recognizing the bad words badwords_re = r'(^|(?<!\w))(%s)(?!\w)' @@ -192,10 +192,10 @@ if own_form: msg = msg + ('<form method="post" action="">\n' '<input type="hidden" name="action" value="%s">\n') % action_name - + checkbox = '<input type="checkbox" name="newwords" value="%(word)s">%(word)s ' msg = msg + ( - " ".join(map(lambda w, cb=checkbox: cb % {'word': wikiutil.escape(w),}, badwords)) + + " ".join(map(lambda w, cb=checkbox: cb % {'word': wikiutil.escape(w), }, badwords)) + '<p><input type="submit" name="button_newwords" value="%s"></p>' % _('Add checked words to dictionary') )
--- a/MoinMoin/action/SubscribeUser.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/SubscribeUser.py Mon Jul 17 04:01:34 2006 +0200 @@ -38,7 +38,7 @@ from MoinMoin.formatter.text_html import Formatter formatter = Formatter(request) - + result = subscribe_users(request, request.form['users'][0].split(","), pagename, formatter) request.write(result) @@ -82,7 +82,7 @@ result.extend([''.join([formatter.smiley('{X}'), formatter.text(" " + _("Not a user:") + " " + username), formatter.linebreak(preformatted=0)]) for username in usernamelist if username not in realusers]) return ''.join(result) - + def execute(pagename, request): _ = request.getText if not request.user.may.admin(pagename): @@ -91,7 +91,7 @@ elif not request.form.has_key('users'): show_form(pagename, request) else: - show_result(pagename,request) + show_result(pagename, request) if __name__ == '__main__': args = sys.argv
--- a/MoinMoin/action/backup.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/backup.py Mon Jul 17 04:01:34 2006 +0200 @@ -25,13 +25,13 @@ tar.add(path) def sendBackup(request): - """ Send compressed tar file """ + """ Send compressed tar file """ dateStamp = time.strftime("%Y-%m-%d--%H-%M-%S-UTC", time.gmtime()) filename = "%s-%s.tar.%s" % (request.cfg.siteid, dateStamp, request.cfg.backup_compression) request.http_headers([ - "Content-Type: application/octet-stream", - "Content-Disposition: inline; filename=\"%s\"" % filename,]) - + "Content-Type: application/octet-stream", + "Content-Disposition: inline; filename=\"%s\"" % filename, ]) + tar = tarfile.open(fileobj=request, mode="w|%s" % request.cfg.backup_compression) # allow GNU tar's longer file/pathnames tar.posix = False @@ -75,7 +75,7 @@ title = _('Wiki Backup / Restore') request.theme.send_title(title, form=request.form, pagename=pagename) request.write(request.formatter.startContent("content")) - + request.write(_("""Some hints: * To restore a backup: * Restoring a backup will overwrite existing data, so be careful. @@ -108,14 +108,14 @@ 'backup_button': _('Backup'), 'restore_button': _('Restore'), }) - + request.write(request.formatter.endContent()) request.theme.send_footer(pagename) request.theme.send_closing_html() def sendMsg(request, pagename, msg): from MoinMoin import Page - return Page.Page(request, pagename).send_page(request, msg=msg) + return Page.Page(request, pagename).send_page(request, msg=msg) def backupAllowed(request): """ Return True if backup is allowed """ @@ -126,18 +126,18 @@ def execute(pagename, request): _ = request.getText - if not backupAllowed(request): - return sendMsg(request, pagename, + if not backupAllowed(request): + return sendMsg(request, pagename, msg=_('You are not allowed to do remote backup.')) - + dowhat = request.form.get('do', [None])[0] if dowhat == 'backup': sendBackup(request) elif dowhat == 'restore': restoreBackup(request, pagename) - elif dowhat == None: + elif dowhat is None: sendBackupForm(request, pagename) else: - return sendMsg(request, pagename, + return sendMsg(request, pagename, msg=_('Unknown backup subaction: %s.' % dowhat))
--- a/MoinMoin/action/fckdialog.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/fckdialog.py Mon Jul 17 04:01:34 2006 +0200 @@ -136,7 +136,7 @@ </body> </html> ''') - + def macro_list(request): from MoinMoin import macro macros = macro.getNames(request.cfg) @@ -150,7 +150,7 @@ macro_re = re.compile( r"\|\|(<.*?>)?\{\{\{\[\[" + r"(?P<prototype>(?P<macro>\w*).*)" + - r"\]\]\}\}\}\s*\|\|" + + r"\]\]\}\}\}\s*\|\|" + r"\s*(?P<help>.*?)\s*\|\|\s*(?P<example>.*?)\s*\|\|$", re.U + re.M) help = {} for match in macro_re.finditer(content): @@ -163,7 +163,7 @@ def page_list(request): from MoinMoin import search - name = request.form.get("pagename",[""])[0] + name = request.form.get("pagename", [""])[0] if name: searchresult = search.searchPages(request, 't:"%s"' % name) pages = [p.page_name for p in searchresult.hits] @@ -207,7 +207,7 @@ from MoinMoin import search # XXX error handling! searchresult = search.searchPages(request, 't:"%s"' % name) - + pages = [p.page_name for p in searchresult.hits] pages.sort() pages[0:0] = [name] @@ -223,13 +223,13 @@ for page in pages]) else: page_list = "" - + # list of interwiki names interwiki_list = wikiutil.load_wikimap(request) interwiki = interwiki_list.keys() interwiki.sort() iwpreferred = request.cfg.interwiki_preferred - if not iwpreferred or iwpreferred and iwpreferred[-1] != None: + if not iwpreferred or iwpreferred and iwpreferred[-1] is not None: resultlist = iwpreferred for iw in interwiki: if not iw in iwpreferred: @@ -374,11 +374,11 @@ from MoinMoin import search # XXX error handling! searchresult = search.searchPages(request, 't:"%s"' % name) - + pages = [p.page_name for p in searchresult.hits] pages.sort() pages[0:0] = [name] - page_list =''' + page_list = ''' <tr> <td colspan=2> <select id="sctPagename" size="1" onchange="OnChangePagename(this.value);"> @@ -390,7 +390,7 @@ for page in pages]) else: page_list = "" - + # wiki url url_prefix = request.cfg.url_prefix scriptname = request.getScriptname()
--- a/MoinMoin/action/fullsearch.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/fullsearch.py Mon Jul 17 04:01:34 2006 +0200 @@ -33,11 +33,11 @@ titlesearch = isTitleSearch(request) # context is relevant only for full search - if titlesearch: - context = 0 + if titlesearch: + context = 0 else: - context = int(request.form.get('context', [0])[0]) - + context = int(request.form.get('context', [0])[0]) + # Get other form parameters needle = request.form.get(fieldname, [''])[0] case = int(request.form.get('case', [0])[0]) @@ -86,10 +86,10 @@ results.sortByPagename() else: title = _('Full Text Search: "%s"') - results.sortByWeight() + results.sortByWeight() request.theme.send_title(title % needle, form=request.form, pagename=pagename) - + # Start content (important for RTL support) request.write(request.formatter.startContent("content")) @@ -102,7 +102,7 @@ output = results.pageListWithContext(request, request.formatter, info=info, context=context) else: - output = results.pageList(request, request.formatter, info=info) + output = results.pageList(request, request.formatter, info=info) request.write(output) request.write(request.formatter.endContent())
--- a/MoinMoin/action/login.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/login.py Mon Jul 17 04:01:34 2006 +0200 @@ -49,7 +49,7 @@ # Require password else: - password = form.get('password',[None])[0] + password = form.get('password', [None])[0] if not password: error = _("Missing password. Please enter user name and password.") else: @@ -57,15 +57,15 @@ error = _("Sorry, login failed.") return self.page.send_page(request, msg=error) - + else: # show login form request.http_headers() request.theme.send_title(_("Login"), pagename=self.pagename) # Start content (important for RTL support) request.write(request.formatter.startContent("content")) - + request.write(userform.getLogin(request)) - + request.write(request.formatter.endContent()) request.theme.send_footer(self.pagename) request.theme.send_closing_html()
--- a/MoinMoin/action/logout.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/logout.py Mon Jul 17 04:01:34 2006 +0200 @@ -11,14 +11,14 @@ from MoinMoin.Page import Page -def execute( pagename, request): +def execute(pagename, request): return LogoutHandler(pagename, request).handle() class LogoutHandler: def __init__(self, pagename, request): self.request = request self._ = request.getText - self.page = Page(request,pagename) + self.page = Page(request, pagename) def handle(self): _ = self._
--- a/MoinMoin/action/newpage.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/newpage.py Mon Jul 17 04:01:34 2006 +0200 @@ -20,7 +20,7 @@ self.referrer = referrer # The page the user came from self.pagename = self.request.form.get('pagename', [None])[0] self.nametemplate = self.request.form.get('nametemplate', ['%s'])[0] - self.nametemplate = self.nametemplate.replace('\x00','') + self.nametemplate = self.nametemplate.replace('\x00', '') def checkAndCombineArguments(self): """ Check arguments in form, return error msg @@ -33,13 +33,13 @@ if not self.pagename and need_replace: return _("Cannot create a new page without a page name." " Please specify a page name.") - if need_replace: - # generate a string that can be safely used as the pagename - # template variable + if need_replace: + # generate a string that can be safely used as the pagename + # template variable repl = 'A@' i = 0 while self.nametemplate.find(repl) != -1: - repl += ['#','&','$','x','X',':','@'][i] + repl += ['#', '&', '$', 'x', 'X', ':', '@'][i] i += 1 i = i % 7 template = self.nametemplate.replace('%s', repl) @@ -53,7 +53,7 @@ else: self.pagename = template return '' - + def checkPermissions(self): """ Check write permission in form, return error msg @@ -69,7 +69,6 @@ def render(self): """ Redirect to the new page, using edit action and template """ - error = self.checkAndCombineArguments() or self.checkPermissions() if error: # Send back to the page you came from, with an error msg
--- a/MoinMoin/action/sitemap.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/sitemap.py Mon Jul 17 04:01:34 2006 +0200 @@ -25,7 +25,7 @@ <priority>%(priority)s</priority> </url> """ % vars - + def sitemap_url(request, base, page): """ return a sitemap <url>..</url> fragment for page object <page> """ url = page.url(request) @@ -71,7 +71,7 @@ result = [] result.append("""<urlset xmlns="http://www.google.com/schemas/sitemap/0.84">\n""") - + # we include the / url as an important and often changed URL result.append(make_url_xml({ 'base': base,
--- a/MoinMoin/action/test.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/test.py Mon Jul 17 04:01:34 2006 +0200 @@ -90,7 +90,7 @@ # TODO: do we need to hide the error when _tests can't be # imported? It might make it hard to debug the tests package # itself. - try: + try: from MoinMoin import _tests except ImportError: request.write(" *** The unit tests are not available ***")
--- a/MoinMoin/action/thread_monitor.py Mon Jul 17 03:43:33 2006 +0200 +++ b/MoinMoin/action/thread_monitor.py Mon Jul 17 04:01:34 2006 +0200 @@ -9,10 +9,10 @@ """ import os, time from StringIO import StringIO - + from MoinMoin import wikiutil from MoinMoin.util import thread_monitor - + def execute_fs(pagename, request): if thread_monitor.hook_enabled: s = StringIO() @@ -43,10 +43,10 @@ thread_monitor.trigger_dump(s) time.sleep(5) # allow for all threads to dump to request request.write(wikiutil.escape(s.getvalue())) - + request.write('</pre>') request.theme.send_footer(pagename) request.theme.send_closing_html() - + execute = execute_fs