[svn] More pylint fixes, update BBcode formatter to new style API.

17 files changed, 44 insertions, 48 deletions

diff --git a/pygments/__init__.py b/pygments/__init__.py
index a0f7c2b5..a27e8a06 100644
--- a/pygments/__init__.py
+++ b/pygments/__init__.py
@@ -140,7 +140,7 @@ The -V option prints the package version.
 
         info = []
         maxlen = 0
-        for mod, fullname, names, exts in LEXERS.itervalues():
+        for _, fullname, names, exts in LEXERS.itervalues():
             tup = (', '.join(names)+':', fullname,
                    exts and '(extensions ' + ', '.join(exts) + ')' or '')
             info.append(tup)
@@ -260,7 +260,6 @@ The -V option prints the package version.
     try:
         highlight(code, lexer, fmter, outfile)
     except Exception, err:
-        raise
         print >>sys.stderr, 'Error while highlighting:', err
         return 1
     return 0
diff --git a/pygments/formatter.py b/pygments/formatter.py
index 7bde9e62..d6b48475 100644
--- a/pygments/formatter.py
+++ b/pygments/formatter.py
@@ -10,7 +10,6 @@
 """
 
 from pygments.util import get_bool_opt
-from pygments.style import Style
 from pygments.styles import get_style_by_name
 
 __all__ = ['Formatter']
diff --git a/pygments/formatters/bbcode.py b/pygments/formatters/bbcode.py
index 223d1110..a03afdb1 100644
--- a/pygments/formatters/bbcode.py
+++ b/pygments/formatters/bbcode.py
@@ -41,25 +41,25 @@ class BBCodeFormatter(Formatter):
 
     def __init__(self, **options):
         Formatter.__init__(self, **options)
-        self._make_styles()
         self._code = get_bool_opt(options, 'codetag', False)
         self._mono = get_bool_opt(options, 'monofont', False)
 
+        self.styles = {} 
+        self._make_styles()
+
     def _make_styles(self):
-        self.styles = {}
-        for token, style in self.style._styles.iteritems():
+        for ttype, ndef in self.style:
             start = end = ''
-            color, bold, italic, underline, bg, border = style
-            if color:
-                start += '[color=#%s]' % color
+            if ndef['color']:
+                start += '[color=#%s]' % ndef['color']
                 end = '[/color]' + end
-            if bold:
+            if ndef['bold']:
                 start += '[b]'
                 end = '[/b]' + end
-            if italic:
+            if ndef['italic']:
                 start += '[i]'
                 end = '[/i]' + end
-            if underline:
+            if ndef['underline']:
                 start += '[u]'
                 end = '[/u]' + end
             # there are no common BBcodes for background-color and border
diff --git a/pygments/formatters/html.py b/pygments/formatters/html.py
index 97e49161..782fb2c7 100644
--- a/pygments/formatters/html.py
+++ b/pygments/formatters/html.py
@@ -12,7 +12,7 @@ import StringIO
 
 from pygments.formatter import Formatter
 from pygments.token import Token, Text, STANDARD_TYPES
-from pygments.util import get_bool_opt, get_int_opt, get_list_opt
+from pygments.util import get_bool_opt, get_int_opt
 
 
 __all__ = ['HtmlFormatter']
diff --git a/pygments/formatters/latex.py b/pygments/formatters/latex.py
index 52796a7e..3cc9d219 100644
--- a/pygments/formatters/latex.py
+++ b/pygments/formatters/latex.py
@@ -147,7 +147,7 @@ class LatexFormatter(Formatter):
                           if cmndef != '#1'])
 
     def format(self, tokensource, outfile):
-        #XXX: add support for background colors!!!!!!!111!1
+        # TODO: add support for background colors
 
         if self.full:
             realoutfile = outfile
diff --git a/pygments/formatters/other.py b/pygments/formatters/other.py
index 0660f0c3..a3657bbb 100644
--- a/pygments/formatters/other.py
+++ b/pygments/formatters/other.py
@@ -10,7 +10,7 @@
 """
 
 from pygments.formatter import Formatter
-import StringIO
+
 
 __all__ = ['NullFormatter', 'RawTokenFormatter']
 
diff --git a/pygments/lexer.py b/pygments/lexer.py
index 51bacdbd..1b55c5d0 100644
--- a/pygments/lexer.py
+++ b/pygments/lexer.py
@@ -15,7 +15,6 @@ try:
 except NameError:
     from sets import Set as set
 
-from types import FunctionType
 from pygments.token import Error, Text, Other, _TokenType
 from pygments.util import get_bool_opt, get_int_opt, make_analysator
 
@@ -372,14 +371,14 @@ class RegexLexer(Lexer):
     #: current one.
     tokens = {}
 
-    def get_tokens_unprocessed(self, text, stack=['root']):
+    def get_tokens_unprocessed(self, text, stack=('root',)):
         """
         Split ``text`` into (tokentype, text) pairs.
 
         ``stack`` is the inital stack (default: ``['root']``)
         """
         pos = 0
-        statestack = stack[:]
+        statestack = list(stack)
         statetokens = self._tokens[statestack[-1]]
         while 1:
             for rex, action, new_state in statetokens:
diff --git a/pygments/lexers/__init__.py b/pygments/lexers/__init__.py
index 96e68a28..d4f5bd90 100644
--- a/pygments/lexers/__init__.py
+++ b/pygments/lexers/__init__.py
@@ -61,13 +61,13 @@ def get_lexer_for_filename(_fn, **options):
     fn = basename(_fn)
     for modname, name, _, filenames, _ in LEXERS.itervalues():
         for filename in filenames:
-            if fnmatch.fnmatch(_fn, filename):
+            if fnmatch.fnmatch(fn, filename):
                 if name not in _lexer_cache:
                     _load_lexers(modname)
                 return _lexer_cache[name](**options)
     for cls in find_plugin_lexers():
         for filename in cls.filenames:
-            if fnmatch.fnmatch(_fn, filename):
+            if fnmatch.fnmatch(fn, filename):
                 return cls(**options)
     raise ValueError('no lexer for filename %r found' % _fn)
 
diff --git a/pygments/lexers/_phpbuiltins.py b/pygments/lexers/_phpbuiltins.py
index 17522a8b..626bc99b 100644
--- a/pygments/lexers/_phpbuiltins.py
+++ b/pygments/lexers/_phpbuiltins.py
@@ -3327,16 +3327,14 @@ MODULES = {'.NET': ['dotnet_load'],
 
 if __name__ == '__main__':
     import pprint
-    import sys
-    import os
     import re
     import urllib
     _function_re = re.compile('<B\s+CLASS="function"\s*>(.*?)\(\)</B\s*>(?uism)')
 
     def get_php_functions():
-        f = urllib.urlopen('http://de.php.net/manual/en/index.functions.php')
-        data = f.read()
-        f.close()
+        uf = urllib.urlopen('http://de.php.net/manual/en/index.functions.php')
+        data = uf.read()
+        uf.close()
         results = set()
         for match in _function_re.finditer(data):
             fn = match.group(1)
@@ -3347,15 +3345,15 @@ if __name__ == '__main__':
         results.sort()
         return results
 
-    def get_function_module(function_name):
-        fn = function_name.replace('_', '-')
-        f = urllib.urlopen('http://de.php.net/manual/en/function.%s.php' % fn)
+    def get_function_module(func_name):
+        fn = func_name.replace('_', '-')
+        uf = urllib.urlopen('http://de.php.net/manual/en/function.%s.php' % fn)
         regex = re.compile('<li class="header up">'
                            '<a href="ref\..*?\.php">([a-zA-Z0-9\s]+)</a></li>')
-        for line in f:
-            m = regex.search(line)
-            if m is not None:
-                return m.group(1)
+        for line in uf:
+            match = regex.search(line)
+            if match:
+                return match.group(1)
 
     print '>> Downloading Function Index'
     functions = get_php_functions()
diff --git a/pygments/lexers/other.py b/pygments/lexers/other.py
index 8fee48ef..01822fc5 100644
--- a/pygments/lexers/other.py
+++ b/pygments/lexers/other.py
@@ -11,8 +11,8 @@
 
 import re
 
-from pygments.lexer import Lexer, RegexLexer, include
-from pygments.token import Token, Error, \
+from pygments.lexer import RegexLexer, include
+from pygments.token import Error, \
      Text, Comment, Operator, Keyword, Name, String, Number
 
 
diff --git a/pygments/lexers/special.py b/pygments/lexers/special.py
index 34e8d88e..e0d26e8c 100644
--- a/pygments/lexers/special.py
+++ b/pygments/lexers/special.py
@@ -12,9 +12,8 @@
 import re
 import cStringIO
 
-from pygments.lexer import Lexer, RegexLexer
-from pygments.token import Token, Error, \
-     Text, Comment, Operator, Keyword, Name, String, Number
+from pygments.lexer import Lexer
+from pygments.token import Token, Error, Text
 
 
 __all__ = ['TextLexer', 'RawTokenLexer']
diff --git a/pygments/lexers/templates.py b/pygments/lexers/templates.py
index 641675b9..21956e47 100644
--- a/pygments/lexers/templates.py
+++ b/pygments/lexers/templates.py
@@ -18,8 +18,7 @@ except NameError:
 from pygments.lexers.web import \
      PhpLexer, HtmlLexer, XmlLexer, JavascriptLexer, CssLexer
 from pygments.lexers.agile import PythonLexer
-from pygments.lexer import \
-     Lexer, DelegatingLexer, RegexLexer, do_insertions, bygroups, \
+from pygments.lexer import Lexer, DelegatingLexer, RegexLexer, bygroups, \
      include, using
 from pygments.token import Error, \
      Text, Comment, Operator, Keyword, Name, String, Number, Other
diff --git a/pygments/lexers/web.py b/pygments/lexers/web.py
index 8e7f3e01..1328b4ff 100644
--- a/pygments/lexers/web.py
+++ b/pygments/lexers/web.py
@@ -15,7 +15,7 @@ try:
 except NameError:
     from sets import Set as set
 
-from pygments.lexer import Lexer, RegexLexer, do_insertions, bygroups, using
+from pygments.lexer import Lexer, RegexLexer, bygroups, using
 from pygments.token import \
      Text, Comment, Operator, Keyword, Name, String, Number, Other
 from pygments.util import get_bool_opt, get_list_opt, looks_like_xml, \
@@ -290,7 +290,7 @@ class PhpLexer(RegexLexer):
             for key, value in MODULES.iteritems():
                 if key not in self.disabledmodules:
                     self._functions.update(value)
-        Lexer.__init__(self, **options)
+        RegexLexer.__init__(self, **options)
 
     def get_tokens_unprocessed(self, text):
         stack = ['root']
diff --git a/pygments/styles/native.py b/pygments/styles/native.py
index 80f2cbbf..d30c27ae 100644
--- a/pygments/styles/native.py
+++ b/pygments/styles/native.py
@@ -11,7 +11,7 @@
 
 from pygments.style import Style
 from pygments.token import Keyword, Name, Comment, String, Error, \
-     Number, Operator, Generic, Text, Token
+     Number, Operator, Generic, Token
 
 
 class NativeStyle(Style):
diff --git a/pygments/styles/trac.py b/pygments/styles/trac.py
index a7767f2f..bc676140 100644
--- a/pygments/styles/trac.py
+++ b/pygments/styles/trac.py
@@ -22,6 +22,8 @@ class TracStyle(Style):
         Comment:                'italic #999988',
         Comment.Preproc:        'bold noitalic #999999',
 
+        Operator:               'bold',
+
         String:                 '#bb8844',
         String.Regex:           '#808000',
 
diff --git a/pygments/token.py b/pygments/token.py
index bbbcc648..6c30442c 100644
--- a/pygments/token.py
+++ b/pygments/token.py
@@ -13,13 +13,13 @@ class _TokenType(tuple):
     parent = None
 
     def split(self):
-        buffer = []
+        buf = []
         node = self
         while node is not None:
-            buffer.append(node)
+            buf.append(node)
             node = node.parent
-        buffer.reverse()
-        return buffer
+        buf.reverse()
+        return buf
 
     def __getattr__(self, val):
         if not val or not val[0].isupper():
diff --git a/pygments/util.py b/pygments/util.py
index 9c84e8dc..94b1bd21 100644
--- a/pygments/util.py
+++ b/pygments/util.py
@@ -106,8 +106,9 @@ def shebang_matches(text, regex):
     Note that this method automatically searches the whole string (eg:
     the regular expression is wrapped in ``'^$'``)
     """
-    if '\n' in text:
-        first_line = text[:text.index('\n')].lower()
+    index = text.find('\n')
+    if index >= 0:
+        first_line = text[:index].lower()
     else:
         first_line = text.lower()
     if first_line.startswith('#!'):