admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

compat: deprecate Utils::JSON in favor of corelib JSON.

Browse Source
This commit is contained in:
William Woodruff 2016-11-20 12:43:13 -05:00
parent 7fbab8be9c
commit 54d18cee17
No known key found for this signature in database
GPG Key ID: 85AE00C504833B3C
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/compat.rb
View File

@ -18,3 +18,4 @@ require "compat/language/haskell"
require "compat/xcode" require "compat/xcode"
require "compat/software_spec" require "compat/software_spec"
require "compat/utils" require "compat/utils"
require "compat/json"

5
Library/Homebrew/utils/json.rb → Library/Homebrew/compat/json.rb
View File

@ -7,16 +7,19 @@ module Utils
Error = Class.new(StandardError) Error = Class.new(StandardError)
def load(str) def load(str)
::JSON.load(str) odeprecated "Utils::JSON.load", "JSON.parse"
::JSON.parse(str)
rescue ::JSON::ParserError => e rescue ::JSON::ParserError => e
raise Error, e.message raise Error, e.message
end end
def dump(obj) def dump(obj)
odeprecated "Utils::JSON.dump", "JSON.generate"
::JSON.generate(obj) ::JSON.generate(obj)
end end
def stringify_keys(obj) def stringify_keys(obj)
odeprecated "Utils::JSON.stringify_keys"
case obj case obj
when Array when Array
obj.map { |val| stringify_keys(val) } obj.map { |val| stringify_keys(val) }

1
Library/Homebrew/utils.rb
View File

@ -9,7 +9,6 @@ require "utils/git"
require "utils/github" require "utils/github"
require "utils/hash" require "utils/hash"
require "utils/inreplace" require "utils/inreplace"
require "utils/json"
require "utils/popen" require "utils/popen"
require "utils/tty" require "utils/tty"