diff options
| author | Georg Brandl <georg@python.org> | 2014-03-04 14:17:10 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-03-04 14:17:10 +0100 |
| commit | 18348a61d7e90b03a624fdc78fafdcb46b92307d (patch) | |
| tree | e4fe1541ad9e2ada2de394eb2e020e2a0916ce94 /pygments/formatter.py | |
| parent | cd9c0b70635f2a6c65ea97d042537478a0a95b7a (diff) | |
| parent | 27895fe85076d2f1b44e7d30387b3f459fc60281 (diff) | |
| download | pygments-18348a61d7e90b03a624fdc78fafdcb46b92307d.tar.gz | |
merge with raichoo/pygments-main (pull request #210)
Diffstat (limited to 'pygments/formatter.py')
| -rw-r--r-- | pygments/formatter.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pygments/formatter.py b/pygments/formatter.py index c1d6f2e1..b16ffee8 100644 --- a/pygments/formatter.py +++ b/pygments/formatter.py @@ -5,20 +5,20 @@ Base formatter class. - :copyright: Copyright 2006-2013 by the Pygments team, see AUTHORS. + :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS. :license: BSD, see LICENSE for details. """ import codecs -from pygments.util import get_bool_opt +from pygments.util import get_bool_opt, string_types from pygments.styles import get_style_by_name __all__ = ['Formatter'] def _lookup_style(style): - if isinstance(style, basestring): + if isinstance(style, string_types): return get_style_by_name(style) return style |