diff options
| author | EricFromCanada <eric3knibbe@gmail.com> | 2013-01-08 11:37:39 -0500 |
|---|---|---|
| committer | EricFromCanada <eric3knibbe@gmail.com> | 2013-01-08 11:37:39 -0500 |
| commit | 7f0374cfb60585e08eff77ec6a3d355dfb2d9a6b (patch) | |
| tree | 03124e2f948523f8ba6636ba8abe4a9003ece91e /pygments/lexer.py | |
| parent | d8ea570bf47ff23179b699701cf28292962df7a8 (diff) | |
| parent | 6e145a03531db07ed5bad04ad6f894559067e2eb (diff) | |
| download | pygments-7f0374cfb60585e08eff77ec6a3d355dfb2d9a6b.tar.gz | |
periodic merge
Diffstat (limited to 'pygments/lexer.py')
| -rw-r--r-- | pygments/lexer.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pygments/lexer.py b/pygments/lexer.py index ad2c72d1..2280a250 100644 --- a/pygments/lexer.py +++ b/pygments/lexer.py @@ -163,6 +163,10 @@ class Lexer(object): text = decoded else: text = text.decode(self.encoding) + else: + if text.startswith(u'\ufeff'): + text = text[len(u'\ufeff'):] + # text now *is* a unicode string text = text.replace('\r\n', '\n') text = text.replace('\r', '\n') |