In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/7493073cc4692a1847372c3db8a96df7b33f9d1e?hp=b43fc6a1c1224963b2a2430029a638a4294147d0>

- Log -----------------------------------------------------------------
commit 7493073cc4692a1847372c3db8a96df7b33f9d1e
Author: Steve Hay <[email protected]>
Date:   Thu Aug 16 00:31:32 2012 +0100

    Upgrade Module-Pluggable to 4.3
    
    There is also no need to list Build.PL as EXCLUDED since it is IGNORABLE
    anyway.

M       Porting/Maintainers.pl
M       cpan/Module-Pluggable/lib/Module/Pluggable.pm
M       cpan/Module-Pluggable/lib/Module/Pluggable/Object.pm
M       cpan/Module-Pluggable/t/24local_inc_object.t
M       cpan/Module-Pluggable/t/lib/Text/Abbrev.pm
M       pod/perldelta.pod

commit 338a1057f3ecc833caa1897d40a280225ec1bf78
Author: Steve Hay <[email protected]>
Date:   Thu Aug 16 00:12:09 2012 +0100

    Upgrade perlfaq to 5.0150041

M       Porting/Maintainers.pl
M       cpan/perlfaq/lib/perlfaq.pm
M       cpan/perlfaq/lib/perlfaq3.pod
M       cpan/perlfaq/lib/perlfaq4.pod
M       cpan/perlfaq/lib/perlfaq5.pod
M       pod/perldelta.pod
-----------------------------------------------------------------------

Summary of changes:
 Porting/Maintainers.pl                             |    5 ++---
 cpan/Module-Pluggable/lib/Module/Pluggable.pm      |    2 +-
 .../lib/Module/Pluggable/Object.pm                 |    4 ++--
 cpan/Module-Pluggable/t/24local_inc_object.t       |    6 +++++-
 cpan/Module-Pluggable/t/lib/Text/Abbrev.pm         |    2 +-
 cpan/perlfaq/lib/perlfaq.pm                        |    2 +-
 cpan/perlfaq/lib/perlfaq3.pod                      |    7 +++++++
 cpan/perlfaq/lib/perlfaq4.pod                      |    4 ++--
 cpan/perlfaq/lib/perlfaq5.pod                      |    4 ++--
 pod/perldelta.pod                                  |    7 ++++++-
 10 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 9109dfd..99b6601 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -768,7 +768,7 @@ use File::Glob qw(:case);
 
     'perlfaq' => {
         'MAINTAINER'   => 'perlfaq',
-        'DISTRIBUTION' => 'LLAP/perlfaq-5.0150040.tar.gz',
+        'DISTRIBUTION' => 'LLAP/perlfaq-5.0150041.tar.gz',
         'FILES'        => q[cpan/perlfaq],
         'EXCLUDED'     => [
             qw( t/release-pod-syntax.t
@@ -1303,9 +1303,8 @@ use File::Glob qw(:case);
 
     'Module::Pluggable' => {
         'MAINTAINER'   => 'simonw',
-        'DISTRIBUTION' => 'SIMONW/Module-Pluggable-4.2.tar.gz',
+        'DISTRIBUTION' => 'SIMONW/Module-Pluggable-4.3.tar.gz',
         'FILES'        => q[cpan/Module-Pluggable],
-        'EXCLUDED'     => ['Build.PL'],
         'UPSTREAM'     => 'cpan',
         'CUSTOMIZED'   => ['Makefile.PL'],
     },
diff --git a/cpan/Module-Pluggable/lib/Module/Pluggable.pm 
b/cpan/Module-Pluggable/lib/Module/Pluggable.pm
index d11156d..5ce4ca9 100644
--- a/cpan/Module-Pluggable/lib/Module/Pluggable.pm
+++ b/cpan/Module-Pluggable/lib/Module/Pluggable.pm
@@ -9,7 +9,7 @@ use Module::Pluggable::Object;
 # Peter Gibbons: I wouldn't say I've been missing it, Bob! 
 
 
-$VERSION = '4.2';
+$VERSION = '4.3';
 $FORCE_SEARCH_ALL_PATHS = 0;
 
 sub import {
diff --git a/cpan/Module-Pluggable/lib/Module/Pluggable/Object.pm 
b/cpan/Module-Pluggable/lib/Module/Pluggable/Object.pm
index 3077b16..d5ab8a8 100644
--- a/cpan/Module-Pluggable/lib/Module/Pluggable/Object.pm
+++ b/cpan/Module-Pluggable/lib/Module/Pluggable/Object.pm
@@ -8,7 +8,7 @@ use Carp qw(croak carp confess);
 use Devel::InnerPackage;
 use vars qw($VERSION);
 
-$VERSION = '4.2';
+$VERSION = '4.3';
 
 
 sub new {
@@ -83,7 +83,7 @@ sub plugins {
         my @objs   = ();
         foreach my $package (keys %plugins) {
                        next unless $package->can($method);
-            my $obj = eval { $package->new(@_) };
+            my $obj = eval { $package->$method(@_) };
                $self->{'on_instantiate_error'}->($package, $@) if $@;
             push @objs, $obj if $obj;           
         }
diff --git a/cpan/Module-Pluggable/t/24local_inc_object.t 
b/cpan/Module-Pluggable/t/24local_inc_object.t
index bedacbd..c8e00fa 100644
--- a/cpan/Module-Pluggable/t/24local_inc_object.t
+++ b/cpan/Module-Pluggable/t/24local_inc_object.t
@@ -10,7 +10,11 @@ ok($ta);
 is($ta->MPCHECK, "HELLO");
 
 package IncTest;
-use Module::Pluggable search_path => "Text", search_dirs => "t/lib", 
instantiate => 'new', on_instantiate_error => sub {};
+use Module::Pluggable search_path => "Text", 
+                      search_dirs => "t/lib", 
+                      instantiate => 'module_pluggable', 
+                      on_require_error     => sub { },
+                      on_instantiate_error => sub { };
 
 sub new {
     my $class = shift;
diff --git a/cpan/Module-Pluggable/t/lib/Text/Abbrev.pm 
b/cpan/Module-Pluggable/t/lib/Text/Abbrev.pm
index fb176ba..8417072 100644
--- a/cpan/Module-Pluggable/t/lib/Text/Abbrev.pm
+++ b/cpan/Module-Pluggable/t/lib/Text/Abbrev.pm
@@ -1,7 +1,7 @@
 package Text::Abbrev;
 use strict;
 
-sub new {
+sub module_pluggable {
     return bless {}, shift;
 }
 
diff --git a/cpan/perlfaq/lib/perlfaq.pm b/cpan/perlfaq/lib/perlfaq.pm
index 163c599..bbd176c 100644
--- a/cpan/perlfaq/lib/perlfaq.pm
+++ b/cpan/perlfaq/lib/perlfaq.pm
@@ -1,6 +1,6 @@
 package perlfaq;
 {
-  $perlfaq::VERSION = '5.0150040';
+  $perlfaq::VERSION = '5.0150041';
 }
 
 0; # not is it supposed to be loaded
diff --git a/cpan/perlfaq/lib/perlfaq3.pod b/cpan/perlfaq/lib/perlfaq3.pod
index 9e9ae8d..8f90c60 100644
--- a/cpan/perlfaq/lib/perlfaq3.pod
+++ b/cpan/perlfaq/lib/perlfaq3.pod
@@ -366,6 +366,13 @@ Perl Editor by EngInSite is a complete integrated 
development
 environment (IDE) for creating, testing, and  debugging  Perl scripts;
 the tool runs on Windows 9x/NT/2000/XP or later.
 
+=item Kephra
+
+L<http://kephra.sf.net>
+
+GUI Editor written in Perl using wxWidgets and Scintilla with lots of smaller 
features.
+Aims for an UI based on Perls principles like TIMTWTDI and "easy thinkd should 
be ..".
+
 =item Komodo
 
 L<http://www.ActiveState.com/Products/Komodo/>
diff --git a/cpan/perlfaq/lib/perlfaq4.pod b/cpan/perlfaq/lib/perlfaq4.pod
index e5de153..8378ba7 100644
--- a/cpan/perlfaq/lib/perlfaq4.pod
+++ b/cpan/perlfaq/lib/perlfaq4.pod
@@ -1266,8 +1266,8 @@ for list operations, so list operations also work on 
arrays:
     wash_animals( qw( dog cat bird ) );
     wash_animals( @animals );
 
-Array operations, which change the scalars, rearranges them, or adds
-or subtracts some scalars, only work on arrays. These can't work on a
+Array operations, which change the scalars, rearrange them, or add
+or subtract some scalars, only work on arrays. These can't work on a
 list, which is fixed. Array operations include C<shift>, C<unshift>,
 C<push>, C<pop>, and C<splice>.
 
diff --git a/cpan/perlfaq/lib/perlfaq5.pod b/cpan/perlfaq/lib/perlfaq5.pod
index d03ca9f..c8cb64e 100644
--- a/cpan/perlfaq/lib/perlfaq5.pod
+++ b/cpan/perlfaq/lib/perlfaq5.pod
@@ -194,11 +194,11 @@ you can fit the whole thing in memory!):
     open my $in,  '<',  $file      or die "Can't read old file: $!"
     open my $out, '>', "$file.new" or die "Can't write new file: $!";
 
-    my @lines = do { local $/; <$in> }; # slurp!
+    my $content = do { local $/; <$in> }; # slurp!
 
         # do your magic here
 
-    print $out @lines;
+    print $out $content;
 
 Modules such as L<File::Slurp> and L<Tie::File> can help with that
 too. If you can, however, avoid reading the entire file at once. Perl
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 3765239..1628a40 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -194,12 +194,17 @@ up by about 40%.
 
 =item *
 
-L<Module::Pluggable> has been upgraded from version 4.0 to 4.2.  Amongst other
+L<Module::Pluggable> has been upgraded from version 4.0 to 4.3.  Amongst other
 changes, triggers are now allowed on events, which gives a powerful way to
 modify behaviour.
 
 =item *
 
+L<perlfaq> has been upgraded from version 5.0150040 to 5.0150041.  This
+contains a couple of minor corrections and lists one new editor.
+
+=item *
+
 L<Pod::Simple> has been upgraded from version 3.20 to 3.23.  Numerous
 improvements have been made, mostly to Pod::Simple::XHTML, which also has a
 compatibility change: the C<codes_in_verbatim> option is now disabled by

--
Perl5 Master Repository

Reply via email to