← Back to branch summary

~ubuntu-branches/ubuntu/hardy/moin/hardy-updates

« back to all changes in this revision

Viewing changes to MoinMoin/wikimacro.py

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2007-12-06 17:44:41 UTC
  • mfrom: (0.6.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20071206174441-20bxkrbqdglgh4l7
Tags: 1.5.8-5ubuntu1
https://launchpad.net/bugs/31728
* Merge with Debian; remaining changes:
  - Suggest python-xml (needed for DocBook rendering). LP: #31728.

Show diffs side-by-side

added added

removed removed

Lines of Context:
MoinMoin/wikimacro.py
215
215
        return self.formatter.rawHTML(html)
216
216
 
217
217
    def _macro_WordIndex(self, args):
 
218
        if self.request.isSpiderAgent: # reduce bot cpu usage
 
219
            return ''
 
220
 
218
221
        _ = self._
219
222
        allpages = int(self.form.get('allpages', [0])[0]) != 0
220
223
        # Get page list readable by current user
349
352
        return self.formatter.rawHTML(buf.getvalue())
350
353
 
351
354
    def _macro_SystemInfo(self, args):
 
355
        if self.request.isSpiderAgent: # reduce bot cpu usage
 
356
            return ''
 
357
 
352
358
        import operator, sys
353
359
        from StringIO import StringIO
354
360
        from MoinMoin import parser, processor, version