diff options
| author | Vipul A M <vipulnsward@gmail.com> | 2013-03-27 20:22:05 +0530 |
|---|---|---|
| committer | Vipul A M <vipulnsward@gmail.com> | 2013-03-27 20:39:36 +0530 |
| commit | b2f7c460767c2ce544d80399ce7d0d2cbc3aa7cb (patch) | |
| tree | 19374cb58a35a2fec4b78926953153814e858bb0 /activerecord/lib/active_record/fixture_set | |
| parent | 81b7ebf7056e23d2614d3071402536d9184ddeed (diff) | |
| download | rails-b2f7c460767c2ce544d80399ce7d0d2cbc3aa7cb.tar.gz rails-b2f7c460767c2ce544d80399ce7d0d2cbc3aa7cb.tar.bz2 rails-b2f7c460767c2ce544d80399ce7d0d2cbc3aa7cb.zip | |
drop errors constant
Diffstat (limited to 'activerecord/lib/active_record/fixture_set')
| -rw-r--r-- | activerecord/lib/active_record/fixture_set/file.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/fixture_set/file.rb b/activerecord/lib/active_record/fixture_set/file.rb index 11b53275e1..fbd7a4d891 100644 --- a/activerecord/lib/active_record/fixture_set/file.rb +++ b/activerecord/lib/active_record/fixture_set/file.rb @@ -24,7 +24,6 @@ module ActiveRecord rows.each(&block) end - RESCUE_ERRORS = [ ArgumentError, Psych::SyntaxError ] # :nodoc: private def rows @@ -32,7 +31,7 @@ module ActiveRecord begin data = YAML.load(render(IO.read(@file))) - rescue *RESCUE_ERRORS => error + rescue ArgumentError, Psych::SyntaxError => error raise Fixture::FormatError, "a YAML error occurred parsing #{@file}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n #{error.class}: #{error}", error.backtrace end @rows = data ? validate(data).to_a : [] |