diff options
| -rw-r--r-- | pygments/formatters/other.py | 4 | ||||
| -rw-r--r-- | tests/test_clexer.py | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pygments/formatters/other.py b/pygments/formatters/other.py index b6e4bc58..c8269b19 100644 --- a/pygments/formatters/other.py +++ b/pygments/formatters/other.py @@ -118,11 +118,11 @@ class RawTokenFormatter(Formatter): TESTCASE_BEFORE = u'''\ def testNeedsName(self): fragment = %r - expected = [ + tokens = [ ''' TESTCASE_AFTER = u'''\ ] - self.assertEqual(expected, list(self.lexer.get_tokens(fragment))) + self.assertEqual(tokens, list(self.lexer.get_tokens(fragment))) ''' diff --git a/tests/test_clexer.py b/tests/test_clexer.py index 5d251d2e..188569dc 100644 --- a/tests/test_clexer.py +++ b/tests/test_clexer.py @@ -43,7 +43,7 @@ class CLexerTest(unittest.TestCase): } } ''' - expected = [ + tokens = [ (Token.Text, u''), (Token.Keyword.Type, u'int'), (Token.Text, u' '), @@ -85,7 +85,7 @@ class CLexerTest(unittest.TestCase): (Token.Text, u'\n'), (Token.Text, u''), ] - self.assertEqual(expected, list(self.lexer.get_tokens(textwrap.dedent(fragment)))) + self.assertEqual(tokens, list(self.lexer.get_tokens(textwrap.dedent(fragment)))) def testSwitchSpaceBeforeColon(self): fragment = u'''\ @@ -99,7 +99,7 @@ class CLexerTest(unittest.TestCase): } } ''' - expected = [ + tokens = [ (Token.Text, u''), (Token.Keyword.Type, u'int'), (Token.Text, u' '), @@ -143,7 +143,7 @@ class CLexerTest(unittest.TestCase): (Token.Text, u'\n'), (Token.Text, u''), ] - self.assertEqual(expected, list(self.lexer.get_tokens(textwrap.dedent(fragment)))) + self.assertEqual(tokens, list(self.lexer.get_tokens(textwrap.dedent(fragment)))) def testLabel(self): fragment = u'''\ @@ -153,7 +153,7 @@ class CLexerTest(unittest.TestCase): goto foo; } ''' - expected = [ + tokens = [ (Token.Text, u''), (Token.Keyword.Type, u'int'), (Token.Text, u' '), @@ -178,7 +178,7 @@ class CLexerTest(unittest.TestCase): (Token.Text, u'\n'), (Token.Text, u''), ] - self.assertEqual(expected, list(self.lexer.get_tokens(textwrap.dedent(fragment)))) + self.assertEqual(tokens, list(self.lexer.get_tokens(textwrap.dedent(fragment)))) def testLabelSpaceBeforeColon(self): fragment = u'''\ @@ -188,7 +188,7 @@ class CLexerTest(unittest.TestCase): goto foo; } ''' - expected = [ + tokens = [ (Token.Text, u''), (Token.Keyword.Type, u'int'), (Token.Text, u' '), @@ -214,7 +214,7 @@ class CLexerTest(unittest.TestCase): (Token.Text, u'\n'), (Token.Text, u''), ] - self.assertEqual(expected, list(self.lexer.get_tokens(textwrap.dedent(fragment)))) + self.assertEqual(tokens, list(self.lexer.get_tokens(textwrap.dedent(fragment)))) def testLabelFollowedByStatement(self): fragment = u'''\ @@ -224,7 +224,7 @@ class CLexerTest(unittest.TestCase): goto foo; } ''' - expected = [ + tokens = [ (Token.Text, u''), (Token.Keyword.Type, u'int'), (Token.Text, u' '), @@ -253,4 +253,4 @@ class CLexerTest(unittest.TestCase): (Token.Text, u'\n'), (Token.Text, u''), ] - self.assertEqual(expected, list(self.lexer.get_tokens(textwrap.dedent(fragment)))) + self.assertEqual(tokens, list(self.lexer.get_tokens(textwrap.dedent(fragment)))) |