Fix various "make check" issues.

3 files changed, 22 insertions, 15 deletions

diff --git a/pygments/filters/__init__.py b/pygments/filters/__init__.py
index 13a2a936..382933b0 100644
--- a/pygments/filters/__init__.py
+++ b/pygments/filters/__init__.py
@@ -341,11 +341,11 @@ class TokenMergeFilter(Filter):
             if ttype is current_type:
                 current_value += value
             else:
-                if not current_type is None:
+                if current_type is not None:
                     yield current_type, current_value
                 current_type = ttype
                 current_value = value
-        if not current_type is None:
+        if current_type is not None:
             yield current_type, current_value
 
 
diff --git a/pygments/lexers/_asybuiltins.py b/pygments/lexers/_asybuiltins.py
index ae4ba0cb..fbfd937e 100644
--- a/pygments/lexers/_asybuiltins.py
+++ b/pygments/lexers/_asybuiltins.py
@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
 """
-    pygments.lexers._asylist
-    ~~~~~~~~~~~~~~~~~~~~~~~~
+    pygments.lexers._asybuiltins
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    This file contains the asy-function names and asy-variable names of Asymptote
+    This file contains the asy-function names and asy-variable names of
+    Asymptote.
 
-    Do not edit the ASYFUNCNAME and ASYVARNAME dict by hand.
-    TODO : perl/python script in Asymptote SVN similar to asy-list.pl but only
+    Do not edit the ASYFUNCNAME and ASYVARNAME sets by hand.
+    TODO: perl/python script in Asymptote SVN similar to asy-list.pl but only
     for function and variable names.
 
-
-    :copyright: 2009 by Olivier Guibé
-    :license: BSD, see LICENSE for more details.
+    :copyright: Copyright 2006-2010 by the Pygments team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
 """
 
 ASYFUNCNAME = set([
diff --git a/pygments/lexers/other.py b/pygments/lexers/other.py
index 0b18c77a..d3eac45c 100644
--- a/pygments/lexers/other.py
+++ b/pygments/lexers/other.py
@@ -923,7 +923,7 @@ class LogtalkLexer(RegexLexer):
 
         'directive': [
             # Conditional compilation directives
-            (r'(el)?if(?=[(])', Keyword, 'root'),		
+            (r'(el)?if(?=[(])', Keyword, 'root'),
             (r'(e(lse|ndif))[.]', Keyword, 'root'),
             # Entity directives
             (r'(category|object|protocol)(?=[(])', Keyword, 'entityrelations'),
@@ -2136,7 +2136,9 @@ class GherkinLexer(RegexLexer):
             (r"[^\|]", Name.Variable),
           ],
         'scenario_sections_on_stack': [
-            (scenario_keywords_regexp, bygroups(Text, Name.Class, Name.Class, Name.Constant), "multiline_descriptions_on_stack"),
+            (scenario_keywords_regexp,
+             bygroups(Text, Name.Class, Name.Class, Name.Constant),
+             "multiline_descriptions_on_stack"),
             ],
         'narrative': [
             include('scenario_sections_on_stack'),
@@ -2170,9 +2172,14 @@ class GherkinLexer(RegexLexer):
             include('table_vars'),
             (r'@[^@\s]+', Name.Namespace),
             (step_keywords_regexp, bygroups(Text, Keyword)),
-            (feature_keywords_regexp, bygroups(Name.Class, Name.Class, Name.Constant), 'narrative'),
-            (scenario_keywords_regexp, bygroups(Text, Name.Class, Name.Class, Name.Constant), "multiline_descriptions"),
-            (examples_regexp, bygroups(Text, Name.Class, Name.Class, Name.Constant), "scenario_table_description"),
+            (feature_keywords_regexp,
+             bygroups(Name.Class, Name.Class, Name.Constant), 'narrative'),
+            (scenario_keywords_regexp,
+             bygroups(Text, Name.Class, Name.Class, Name.Constant),
+             "multiline_descriptions"),
+            (examples_regexp,
+             bygroups(Text, Name.Class, Name.Class, Name.Constant),
+             "scenario_table_description"),
             (r'(\s|.)', Text),
         ]
     }