@@ -1,5 +1,16 @@ Revision history for autodie + * BUGFIX: format_default() in autodie::exception no longer + returns a string with file and line attached. This would + cause the file and line information to appear twice when + format handlers would choose to fall back to the defaults. + The file and line information is now always added by + stringify(). (RT #47520, thanks to Michael Schwern) + + * BUGFIX: Exceptions thrown by 2-argument open() are more likely + to specify the mode as 'for reading' when no explicit + mode was given. (RT #47520, thanks to Michael Schwern) + 2.04 Thu Jul 2 18:56:57 AUSEST 2009 * TEST: Removed spurious warning about insufficient credit. Changes @@ -417,8 +417,20 @@ sub _format_open { [^&] # Not an ampersand (which means a dup) }x; - # Have a funny mode? Use the default format. - return $this->format_default if not defined $mode; + if (not $mode) { + # Maybe it's a 2-arg open without any mode at all? + # Detect the most simple case for this, where our + # file consists only of word characters. + + if ( $file =~ m{^\s*\w+\s*$} ) { + $mode = '<' + } + else { + # Otherwise, we've got no idea what's going on. + # Use the default. + return $this->format_default; + } + } # Localising $! means perl make make it a pretty error for us. local $! = $this->errno; @@ -517,7 +529,7 @@ sub stringify { return $sub->($this) . $this->add_file_and_line; } - return $this->format_default; + return $this->format_default . $this->add_file_and_line; } @@ -568,8 +580,7 @@ sub format_default { # Format our beautiful error. - return "Can't $call(". join(q{, }, @args) . "): $!" . - $this->add_file_and_line; + return "Can't $call(". join(q{, }, @args) . "): $!" ; # TODO - Handle user-defined errors from hash. lib/autodie/exception.pm @@ -16,3 +16,34 @@ ok($@, "2-arg opening non-existent file fails"); like($@, qr/for reading/, "Well-formatted 2-arg open failure"); unlike($@, qr/GLOB\(0x/, "No ugly globs in 2-arg open messsage"); + +# RT 47520. 2-argument open without mode would repeat the file +# and line number. + +eval { + use autodie; + + open(my $fh, NO_SUCH_FILE); +}; + +isa_ok($@, 'autodie::exception'); +like( $@, qr/at \S+ line \d+/, "At least one mention"); +unlike($@, qr/at \S+ line \d+\s+at \S+ line \d+/, "...but not too mentions"); + +# RT 47520-ish. 2-argument open without a mode should be marked +# as 'for reading'. +like($@, qr/for reading/, "Well formatted 2-arg open without mode"); + +# We also shouldn't get repeated messages, even if the default mode +# was used. Single-arg open always falls through to the default +# formatter. + +eval { + use autodie; + + open( NO_SUCH_FILE . "" ); +}; + +isa_ok($@, 'autodie::exception'); +like( $@, qr/at \S+ line \d+/, "At least one mention"); +unlike($@, qr/at \S+ line \d+\s+at \S+ line \d+/, "...but not too mentions"); t/open.t 79a10c3a3e2f4cab5398e26684e6c0c0c2893d25 Paul Fenwick pjf@perltraining.com.au http://github.com/pfenwick/autodie/commit/8b12854da6dab4b53ff5d47f462411c29b301859 8b12854da6dab4b53ff5d47f462411c29b301859 2009-07-02T18:56:36-07:00 2009-07-02T18:56:36-07:00 RT #47520 - No double file/line messages. Better 2-arg open messages. 0bca6df5f7693320cfa75dacbc0b81541b754504 Paul Fenwick pjf@perltraining.com.au