diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 16:06:02 +0200 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2013-06-23 16:06:02 +0200 |
| commit | 0013b649f714f23eef0859921fa7804ca7caef76 (patch) | |
| tree | 7c278ee7c420729b4738fe2a195e529ffd2bb6da /lib/coderay/scanners/python.rb | |
| parent | addcbd446066d0da1627112814e3ce1b8d404da0 (diff) | |
| parent | 64ca2ae8ad5130bdcf652aa7aa08298de00f20f4 (diff) | |
| download | coderay-0013b649f714f23eef0859921fa7804ca7caef76.tar.gz | |
Merge branch 'master' into go-scanner
Conflicts:
lib/coderay/helpers/file_type.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 |