[Jifty-commit] r7478 - Template-Declare/trunk/lib/Template
Jifty commits
jifty-commit at lists.jifty.org
Thu Sep 3 18:37:46 EDT 2009
Author: theory
Date: Thu Sep 3 18:37:46 2009
New Revision: 7478
Modified:
Template-Declare/trunk/lib/Template/Declare.pm
Log:
Use __PACKAGE__ where possible.
Modified: Template-Declare/trunk/lib/Template/Declare.pm
==============================================================================
--- Template-Declare/trunk/lib/Template/Declare.pm (original)
+++ Template-Declare/trunk/lib/Template/Declare.pm Thu Sep 3 18:37:46 2009
@@ -454,14 +454,14 @@
# If we're being called as a class method on T::D it means "search in any package"
# Otherwise, it means search only in this specific package"
- if ( $self eq 'Template::Declare' ) {
+ if ( $self eq __PACKAGE__ ) {
@search_packages = reverse @{ Template::Declare->roots };
} else {
@search_packages = ($self);
}
foreach my $package (@search_packages) {
- next unless ( $package and $package->isa('Template::Declare') );
+ next unless ( $package and $package->isa(__PACKAGE__) );
if ( my $coderef = $package->_has_template( $template_name, $show_private ) ) {
return $coderef;
} elsif ( $coderef = $package->_has_aliased_template($template_name, $show_private) ) {
@@ -576,7 +576,7 @@
=cut
sub import_templates {
- return undef if $_[0] eq 'Template::Declare';
+ return undef if $_[0] eq __PACKAGE__;
my $import_into = caller(0);
my $import_from_base = shift;
my $prepend_path = shift;
@@ -585,7 +585,7 @@
$prepend_path =~ s|/$||;
$import_from_base->imported_into($prepend_path);
- my @packages = reverse grep { $_->isa('Template::Declare') }
+ my @packages = reverse grep { $_->isa(__PACKAGE__) }
Class::ISA::self_and_super_path( $import_from_base );
foreach my $import_from (@packages) {
More information about the Jifty-commit
mailing list