diff options
| -rw-r--r-- | pygments/formatter.py | 2 | ||||
| -rw-r--r-- | pygments/formatters/bbcode.py | 2 | ||||
| -rw-r--r-- | pygments/lexer.py | 2 | ||||
| -rw-r--r-- | tests/test_basic_api.py | 4 | ||||
| -rw-r--r-- | tests/test_cmdline.py | 4 | ||||
| -rw-r--r-- | tests/test_examplefiles.py | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/pygments/formatter.py b/pygments/formatter.py index 4082150b..fe7ccc97 100644 --- a/pygments/formatter.py +++ b/pygments/formatter.py @@ -48,7 +48,7 @@ class Formatter(object): self.style = _lookup_style(options.get('style', 'default')) self.full = get_bool_opt(options, 'full', False) self.title = options.get('title', '') - self.encoding = options.get('encoding', 'latin1') + self.encoding = options.get('encoding', 'latin1') self.options = options def get_style_defs(self, arg=''): diff --git a/pygments/formatters/bbcode.py b/pygments/formatters/bbcode.py index a8663ea9..813e0d4c 100644 --- a/pygments/formatters/bbcode.py +++ b/pygments/formatters/bbcode.py @@ -44,7 +44,7 @@ class BBCodeFormatter(Formatter): self._code = get_bool_opt(options, 'codetag', False) self._mono = get_bool_opt(options, 'monofont', False) - self.styles = {} + self.styles = {} self._make_styles() def _make_styles(self): diff --git a/pygments/lexer.py b/pygments/lexer.py index e19526b8..d3a05f0b 100644 --- a/pygments/lexer.py +++ b/pygments/lexer.py @@ -53,7 +53,7 @@ class Lexer(object): ``encoding`` If given, must be an encoding name. This encoding will be used to convert the input string to Unicode, if it is not already a Unicode - string. The default is to use latin1 (default: 'latin1'). + string. The default is to use latin1 (default: 'latin1'). """ #: Name of the lexer diff --git a/tests/test_basic_api.py b/tests/test_basic_api.py index 41aa01dc..0301f290 100644 --- a/tests/test_basic_api.py +++ b/tests/test_basic_api.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- """ Pygments basic API tests - ~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~ :copyright: 2006 by Georg Brandl. - :license: GNU GPL, see LICENSE for more details. + :license: GNU LGPL, see LICENSE for more details. """ import unittest diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index 803182f6..1126e695 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -17,7 +17,7 @@ from pygments import cmdline_main, highlight def run_cmdline(*args): saved_stdout = sys.stdout - saved_stderr = sys.stderr + saved_stderr = sys.stderr new_stdout = sys.stdout = StringIO.StringIO() new_stderr = sys.stderr = StringIO.StringIO() try: @@ -45,7 +45,7 @@ class CmdLineTest(unittest.TestCase): from pygments.lexers import PythonLexer from pygments.formatters import HtmlFormatter filename = os.path.join(testdir, testfile) - code = file(filename).read() + code = file(filename).read() output = highlight(code, PythonLexer(), HtmlFormatter()) diff --git a/tests/test_examplefiles.py b/tests/test_examplefiles.py index 247f986d..2c779618 100644 --- a/tests/test_examplefiles.py +++ b/tests/test_examplefiles.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- """ Pygments tests with example files - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ :copyright: 2006 by Georg Brandl. - :license: GNU GPL, see LICENSE for more details. + :license: GNU LGPL, see LICENSE for more details. """ import unittest |