diff options
| author | Kornelius Kalnbach <murphy@rubychan.de> | 2014-01-23 22:23:59 +0100 |
|---|---|---|
| committer | Kornelius Kalnbach <murphy@rubychan.de> | 2014-01-23 22:23:59 +0100 |
| commit | ee76cc5df42af385743d81ec0810073b7c9ed465 (patch) | |
| tree | 89387c694298768c2ea4766eff097cdd5006fbdf /lib/coderay/scanners/python.rb | |
| parent | 4131a5ff622e7c767dfd042c4c357906a2544c01 (diff) | |
| parent | e93aae88985667189bb5b24ad0d5f54cb5fdba70 (diff) | |
| download | coderay-ee76cc5df42af385743d81ec0810073b7c9ed465.tar.gz | |
Merge branch 'master' into bash-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 |