diff contrib/simplemerge @ 32926:661025fd3e1c

highlight: put pygments import inside demandimport.deactivated I tripped on some weirdness relating to _thread vs threading way down in a dep of highlight recently. I'm not really sure why I'm only just seeing this defect now, but experimentally this fixes the problem, and shouldn't cause any load-time slowness for people until pygments is actually about to be used since highlight.highlight is still lazily loaded in the highlight/__init__.py file.
author Augie Fackler <raf@durin42.com>
date Sun, 18 Jun 2017 23:05:54 -0400
parents 541949a10a68
children aed91971d88c
line wrap: on
line diff