diff options
| author | Georg Brandl <georg@python.org> | 2016-01-16 12:04:01 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2016-01-16 12:04:01 +0100 |
| commit | fe642a9838af4716485f94fa5bd3e12684d9e14e (patch) | |
| tree | cffb2cdb3947acc6affa04473222921cdedd5e4d | |
| parent | bc2ed425ce8ce63d1364c0b53a9b8d6686a9109c (diff) | |
| parent | f1b694dc778141793d8a536a47a8fa65edf1e129 (diff) | |
| download | pygments-fe642a9838af4716485f94fa5bd3e12684d9e14e.tar.gz | |
merge
| -rw-r--r-- | pygments/formatters/img.py | 2 | ||||
| -rw-r--r-- | pygments/lexers/asm.py | 2 | ||||
| -rw-r--r-- | pygments/lexers/chapel.py | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py index 667a8697..a7b5d51e 100644 --- a/pygments/formatters/img.py +++ b/pygments/formatters/img.py @@ -83,7 +83,7 @@ class FontManager(object): if proc.returncode == 0: lines = stdout.splitlines() if lines: - path = lines[0].strip().strip(':') + path = lines[0].decode().strip().strip(':') return path def _create_nix(self): diff --git a/pygments/lexers/asm.py b/pygments/lexers/asm.py index 918ed83b..bbe04f69 100644 --- a/pygments/lexers/asm.py +++ b/pygments/lexers/asm.py @@ -87,7 +87,7 @@ class GasLexer(RegexLexer): (r'#.*?\n', Comment) ], 'punctuation': [ - (r'[-*,.():]+', Punctuation) + (r'[-*,.()\[\]!:]+', Punctuation) ] } diff --git a/pygments/lexers/chapel.py b/pygments/lexers/chapel.py index 5b7be4dd..d69c55f5 100644 --- a/pygments/lexers/chapel.py +++ b/pygments/lexers/chapel.py @@ -77,7 +77,8 @@ class ChapelLexer(RegexLexer): (r'[0-9]+', Number.Integer), # strings - (r'["\'](\\\\|\\"|[^"\'])*["\']', String), + (r'"(\\\\|\\"|[^"])*"', String), + (r"'(\\\\|\\'|[^'])*'", String), # tokens (r'(=|\+=|-=|\*=|/=|\*\*=|%=|&=|\|=|\^=|&&=|\|\|=|<<=|>>=|' |