Merge [5763] from trunk.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5764 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

activesupport/lib/active_support/deprecation.rb

@@ -143,14 +143,21 @@ def collect_deprecations
         end
     end
 
-    # Stand-in for @request, @attributes, etc.
+    # Stand-in for @request, @attributes, @params, etc which emits deprecation
+    # warnings on any method call (except #inspect).
     class DeprecatedInstanceVariableProxy
       instance_methods.each { |m| undef_method m unless m =~ /^__/ }
 
       def initialize(instance, method, var = "@#{method}")
         @instance, @method, @var = instance, method, var
       end
 
+      # Don't give a deprecation warning on inspect since test/unit and error
+      # logs rely on it for diagnostics.
+      def inspect
+        target.inspect
+      end
+
       private
         def method_missing(called, *args, &block)
           warn caller, called, args

activesupport/test/deprecation_test.rb

@@ -79,6 +79,10 @@ def test_deprecated_instance_variable_proxy
     assert_deprecated('@request.to_s') { assert_equal @dtc.request.to_s, @dtc.old_request.to_s }
   end
 
+  def test_deprecated_instance_variable_proxy_shouldnt_warn_on_inspect
+    assert_not_deprecated { assert_equal @dtc.request.inspect, @dtc.old_request.inspect }
+  end
+
   def test_assert_deprecation_without_match
     assert_deprecated do
       @dtc.partially