 > 
 > try:
 >     from pygments import highlight
->     from pygments.lexers import DiffLexer
->     from pygments.formatters import HtmlFormatter
+>     from pygments.lexers import DiffLexer # pylint: disable=E0611
+>     from pygments.formatters import HtmlFormatter # pylint: disable=E0611
 >     pygments_available = True
 > except ImportError:
 >     pygments_available = False
 > 
-16c29,30
+16c36,37
 < Separator = "\n>---------------------------------------------------------------\n"
 ---
 > Separator = "\n>%s\n" % ('-' * 62)
 > Separhtml = "<hr>"
-19a34
-> 
-26c41,44
+19a41
+> 
+26c48,51
 <     ("allchanges", True, set(), "branches for which *all* changes are to be reported"),
 ---
 >     ("allchanges", True, set(),
 >      "branches for which *all* changes are to be reported"),
 >     ("altsubject", False, False,
 >      "enables alternative subject with repository name"),
-30c48,49
+30c55,56
 <     ("hostname", True, socket.gethostname(), "host where the repository is hosted"),
 ---
 >     ("hostname", True, socket.gethostname(),
 >      "host where the repository is hosted"),
-33c52,57
+33c59,64
 <     ("manual", True, None, "notifiy for a manually given set of revisions"),
 ---
 >     ("smtpserver", True, 'localhost', "tells SMTP server to use, host only"),

>     message.addTag("Deleted %s" % key, value)
> 
>     # print whole message to file
>     print >>out, message.getMessage()
>     message.sendFile(out, fname)
338,339c688,696
< 
<     (out, fname) = generateMailHeader(subject)
---
>     repo = _getRepo()
>     # The 'git show' prettifier
>     prettyhtml = PrettyHTML(subject='Git commit %s' % subject[-9:])

<     # which may then make them appear to have arrived in the wrong order.
<     if not Config.debug:
<         time.sleep(2)
316a703,705
>     '''
>     Hook for adding an entry
>     '''
317a707
>     (out, fname) = makeTmp()
319,324c709,718
<     (out, fname) = generateMailHeader("%s '%s' created" % (key, value))
< 
<     print >>out, mailTag("New %s" % key, value)
