aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-06-19 20:49:52 -0400
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-10-10 01:35:58 -0300
commit1740610a084b9527b3439d5aa7053ce524ac8a54 (patch)
treeb51a57fa6e4718e35c99096d666fe849aef6312a
parent2a3718f434ac9dfeac3473c41a78d81aba9dbc1b (diff)
downloadrails-1740610a084b9527b3439d5aa7053ce524ac8a54.tar.gz
rails-1740610a084b9527b3439d5aa7053ce524ac8a54.tar.bz2
rails-1740610a084b9527b3439d5aa7053ce524ac8a54.zip
Remove deprecated code in ActionDispatch::ParamsParser::ParseError
-rw-r--r--actionpack/CHANGELOG.md9
-rw-r--r--actionpack/lib/action_dispatch/middleware/params_parser.rb18
2 files changed, 10 insertions, 17 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index d21f771b4b..d50cb32357 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,12 @@
+* Remove deprecated `original_exception` and `message` arguments in
+ `ActionDispatch::ParamsParser::ParseError#initialize`.
+
+ *Rafael Mendonça França*
+
+* Remove deprecated `#original_exception` in `ActionDispatch::ParamsParser::ParseError`.
+
+ *Rafael Mendonça França*
+
* Remove deprecated access to mime types through constants.
*Rafael Mendonça França*
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
index 5f96b80e87..e7d7d672ac 100644
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -10,25 +10,9 @@ module ActionDispatch
# Raised when raw data from the request cannot be parsed by the parser
# defined for request's content mime type.
class ParseError < StandardError
- def initialize(message = nil, original_exception = nil)
- if message
- ActiveSupport::Deprecation.warn("Passing #message is deprecated and has no effect. " \
- "#{self.class} will automatically capture the message " \
- "of the original exception.", caller)
- end
-
- if original_exception
- ActiveSupport::Deprecation.warn("Passing #original_exception is deprecated and has no effect. " \
- "Exceptions will automatically capture the original exception.", caller)
- end
-
+ def initialize
super($!.message)
end
-
- def original_exception
- ActiveSupport::Deprecation.warn("#original_exception is deprecated. Use #cause instead.", caller)
- cause
- end
end
# Create a new +ParamsParser+ middleware instance.