diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-22 23:52:44 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-22 23:52:44 +0200 |
| commit | 5b1a49fdd3bef559991242a4ad7d3d1ed9cb48c8 (patch) | |
| tree | 9e74edadd344247e805f6bd3588a34fdf0dbfa21 /lib/coderay/scanners/python.rb | |
| parent | 69246fc8ed0344eae4dab35286813a00010a08cb (diff) | |
| parent | 2abfc49bdc9a9f4e86c90aa968c302ca76c20812 (diff) | |
| download | coderay-5b1a49fdd3bef559991242a4ad7d3d1ed9cb48c8.tar.gz | |
Merge branch 'master' into lua-scanner
Conflicts:
lib/coderay/styles/alpha.rb
lib/coderay/token_kinds.rb
Diffstat (limited to 'lib/coderay/scanners/python.rb')
| -rw-r--r-- | lib/coderay/scanners/python.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/coderay/scanners/python.rb b/lib/coderay/scanners/python.rb index a9492ab..09c8b6e 100644 --- a/lib/coderay/scanners/python.rb +++ b/lib/coderay/scanners/python.rb @@ -157,12 +157,12 @@ module Scanners encoder.text_token match, :operator elsif match = scan(/(u?r?|b)?("""|"|'''|')/i) + modifiers = self[1] string_delimiter = self[2] - string_type = docstring_coming ? :docstring : :string + string_type = docstring_coming ? :docstring : (modifiers == 'b' ? :binary : :string) docstring_coming = false if docstring_coming encoder.begin_group string_type string_raw = false - modifiers = self[1] unless modifiers.empty? string_raw = !!modifiers.index(?r) encoder.text_token modifiers, :modifier |