diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 09:10:14 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-04-22 09:10:48 -0700 |
| commit | 42a06d2d6253eed3b9f4fb4edfa251c9508a2e20 (patch) | |
| tree | b842a72ac3cdd144375fb140686fff71cd69befe /activesupport/lib/active_support/json/decoding.rb | |
| parent | ca49299434bc764b667cd86846d892e91a150ef3 (diff) | |
| download | rails-42a06d2d6253eed3b9f4fb4edfa251c9508a2e20.tar.gz rails-42a06d2d6253eed3b9f4fb4edfa251c9508a2e20.tar.bz2 rails-42a06d2d6253eed3b9f4fb4edfa251c9508a2e20.zip | |
stdlib autoloads were hanging on 1.9.1
Diffstat (limited to 'activesupport/lib/active_support/json/decoding.rb')
| -rw-r--r-- | activesupport/lib/active_support/json/decoding.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/json/decoding.rb b/activesupport/lib/active_support/json/decoding.rb index c66500aa9c..70e9f40fc7 100644 --- a/activesupport/lib/active_support/json/decoding.rb +++ b/activesupport/lib/active_support/json/decoding.rb @@ -1,6 +1,3 @@ -autoload :YAML, 'yaml' unless defined? YAML -autoload :StringScanner, 'strscan' unless defined? StringScanner - require 'active_support/core_ext/string/starts_ends_with' module ActiveSupport @@ -22,7 +19,8 @@ module ActiveSupport # Ensure that ":" and "," are always followed by a space def convert_json_to_yaml(json) #:nodoc: - scanner, quoting, marks, pos, times = StringScanner.new(json), false, [], nil, [] + require 'strscan' unless defined? ::StringScanner + scanner, quoting, marks, pos, times = ::StringScanner.new(json), false, [], nil, [] while scanner.scan_until(/(\\['"]|['":,\\]|\\.)/) case char = scanner[1] when '"', "'" |