← Back to branch summary

~ubuntu-branches/ubuntu/natty/moin/natty-security

« back to all changes in this revision

Viewing changes to MoinMoin/support/pygments/filters/__init__.py

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2010-08-11 12:35:34 UTC
  • mfrom: (0.1.19 sid)
  • Revision ID: james.westby@ubuntu.com-20100811123534-q8zu7qrwqul6cvec
Tags: 1.9.3-1ubuntu1
https://launchpad.net/bugs/586518
* Merge from Debian unstable (LP: #586518). Based on work by Stefan Ebner.
  Remaining changes:
 - Remove python-xml from Suggests field, the package isn't anymore in
   sys.path.
 - Demote fckeditor from Recommends to Suggests; the code was previously
   embedded in moin, but it was also disabled, so there's no reason 
   for us to pull this in by default currently. Note: fckeditor has a
   number of security problems and so this change probably needs to be
   carried indefinitely.

Show diffs side-by-side

added added

removed removed

Lines of Context:
MoinMoin/support/pygments/filters/__init__.py
9
9
    :copyright: Copyright 2006-2010 by the Pygments team, see AUTHORS.
10
10
    :license: BSD, see LICENSE for details.
11
11
"""
12
 
try:
13
 
    set
14
 
except NameError:
15
 
    from sets import Set as set
16
12
 
17
13
import re
 
14
 
18
15
from pygments.token import String, Comment, Keyword, Name, Error, Whitespace, \
19
16
    string_to_tokentype
20
17
from pygments.filter import Filter
21
 
from pygments.util import get_list_opt, get_int_opt, get_bool_opt, get_choice_opt, \
22
 
     ClassNotFound, OptionError
 
18
from pygments.util import get_list_opt, get_int_opt, get_bool_opt, \
 
19
     get_choice_opt, ClassNotFound, OptionError
23
20
from pygments.plugin import find_plugin_filters
24
21
 
25
22