highlight: some small cleanups

hgext/highlight.py

@@ -20,16 +20,11 b' file should be re-generated by running'
 
 # pygmentize -f html -S <newstyle>
 
-
 -- Adam Hupp <[e-mail]>
-
-
 """
 
 from mercurial import demandimport
-demandimport.ignore.extend(['pkgutil',
-                            'pkg_resources',
-                            '__main__',])
+demandimport.ignore.extend(['pkgutil', 'pkg_resources', '__main__',])
 
 from mercurial.hgweb import webcommands, webutil
 from mercurial import util
@@ -43,7 +38,8 b' from pygments.formatters import HtmlForm'
 SYNTAX_CSS = ('\n<link rel="stylesheet" href="#staticurl#highlight.css" '
               'type="text/css" />')
 
-def pygmentize(self, tmpl, fctx, field):
+def pygmentize(field, fctx, style, tmpl):
+
     # append a <link ...> to the syntax highlighting css
     old_header = ''.join(tmpl('header'))
     if SYNTAX_CSS not in old_header:
@@ -54,7 +50,6 b' def pygmentize(self, tmpl, fctx, field):'
     if util.binary(text):
         return
 
-    style = self.config("web", "pygments_style", "colorful")
     # To get multi-line strings right, we can't format line-by-line
     try:
         lexer = guess_lexer_for_filename(fctx.path(), text,
@@ -83,12 +78,14 b' web_filerevision = webcommands._filerevi'
 web_annotate = webcommands.annotate
 
 def filerevision_highlight(web, tmpl, fctx):
-    pygmentize(web, tmpl, fctx, 'fileline')
+    style = web.config('web', 'pygments_style', 'colorful')
+    pygmentize('fileline', fctx, style, tmpl)
     return web_filerevision(web, tmpl, fctx)
 
 def annotate_highlight(web, req, tmpl):
     fctx = webutil.filectx(web.repo, req)
-    pygmentize(web, tmpl, fctx, 'annotateline')
+    style = web.config('web', 'pygments_style', 'colorful')
+    pygmentize('annotateline', fctx, style, tmpl)
     return web_annotate(web, req, tmpl)
 
 # monkeypatch in the new version