diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-12-26 01:28:12 -0800 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-12-26 01:28:12 -0800 |
| commit | 63e14a7969834f9cc716b9c996aad381b57c0882 (patch) | |
| tree | a209fccd9385f8948c85eba98ff7b3b3b73da80c /activesupport | |
| parent | b417d3d43be911190ee3e8e746da68698779959d (diff) | |
| parent | a7ba8e1fb325a20dc5115eeef278ce946d0450c7 (diff) | |
| download | rails-63e14a7969834f9cc716b9c996aad381b57c0882.tar.gz rails-63e14a7969834f9cc716b9c996aad381b57c0882.tar.bz2 rails-63e14a7969834f9cc716b9c996aad381b57c0882.zip | |
Merge pull request #4118 from nashby/remove-file-to-path
remove File#to_path alias
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/file.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/file/path.rb | 5 | ||||
| -rw-r--r-- | activesupport/lib/active_support/ruby/shim.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/core_ext/file_test.rb | 4 |
4 files changed, 0 insertions, 11 deletions
diff --git a/activesupport/lib/active_support/core_ext/file.rb b/activesupport/lib/active_support/core_ext/file.rb index a763447566..dc24afbe7f 100644 --- a/activesupport/lib/active_support/core_ext/file.rb +++ b/activesupport/lib/active_support/core_ext/file.rb @@ -1,2 +1 @@ require 'active_support/core_ext/file/atomic' -require 'active_support/core_ext/file/path' diff --git a/activesupport/lib/active_support/core_ext/file/path.rb b/activesupport/lib/active_support/core_ext/file/path.rb deleted file mode 100644 index b5feab80ae..0000000000 --- a/activesupport/lib/active_support/core_ext/file/path.rb +++ /dev/null @@ -1,5 +0,0 @@ -class File - unless File.allocate.respond_to?(:to_path) - alias to_path path - end -end
\ No newline at end of file diff --git a/activesupport/lib/active_support/ruby/shim.rb b/activesupport/lib/active_support/ruby/shim.rb index 6e1e375e06..9652eb4028 100644 --- a/activesupport/lib/active_support/ruby/shim.rb +++ b/activesupport/lib/active_support/ruby/shim.rb @@ -16,4 +16,3 @@ require 'active_support/core_ext/string/interpolation' require 'active_support/core_ext/string/encoding' require 'active_support/core_ext/rexml' require 'active_support/core_ext/time/conversions' -require 'active_support/core_ext/file/path' diff --git a/activesupport/test/core_ext/file_test.rb b/activesupport/test/core_ext/file_test.rb index e1258b872e..26be694176 100644 --- a/activesupport/test/core_ext/file_test.rb +++ b/activesupport/test/core_ext/file_test.rb @@ -57,10 +57,6 @@ class AtomicWriteTest < Test::Unit::TestCase File.unlink(file_name) rescue nil end - def test_responds_to_to_path - assert_equal __FILE__, File.open(__FILE__, "r").to_path - end - private def file_name "atomic.file" |