X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FUtils.pm;h=f47909d39fc8c874d61b971764fe5e6fcea08aff;hb=d3082facb5273f9970121638c0385ecfc0f7b090;hp=07c20585015c3e3263890d10b593a27df0ff627b;hpb=39fc2ce1e456c4e2a272204aa8fe67896984b3a6;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm index 07c2058..f47909d 100644 --- a/lib/Catalyst/Utils.pm +++ b/lib/Catalyst/Utils.pm @@ -9,6 +9,8 @@ use URI; use Carp qw/croak/; use Cwd; +use namespace::clean; + =head1 NAME Catalyst::Utils - The Catalyst Utils @@ -19,7 +21,7 @@ See L. =head1 DESCRIPTION -Catalyst Utilities. +Catalyst Utilities. =head1 METHODS @@ -295,7 +297,7 @@ sub merge_hashes { my ( $lefthash, $righthash ) = @_; return $lefthash unless defined $righthash; - + my %merged = %$lefthash; for my $key ( keys %$righthash ) { my $right_ref = ( ref $righthash->{ $key } || '' ) eq 'HASH'; @@ -309,7 +311,7 @@ sub merge_hashes { $merged{ $key } = $righthash->{ $key }; } } - + return \%merged; } @@ -344,10 +346,10 @@ All you need to get this work, is: 1) Install Term::Size::Any, or -2) Export $COLUMNS from your shell. +2) Export $COLUMNS from your shell. (Warning to bash users: 'echo $COLUMNS' may be showing you the bash -variable, not $ENV{COLUMNS}. 'export COLUMNS=$COLUMNS' and you should see +variable, not $ENV{COLUMNS}. 'export COLUMNS=$COLUMNS' and you should see that 'env' now lists COLUMNS.) As last resort, default value of 80 chars will be used. @@ -381,7 +383,7 @@ Catalyst Contributors, see Catalyst.pm =head1 COPYRIGHT -This program is free software, you can redistribute it and/or modify it under +This library is free software. You can redistribute it and/or modify it under the same terms as Perl itself. =cut