summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2011-06-16 12:47:07 +0200
committerNicholas Clark <nick@ccl4.org>2011-06-16 12:56:13 +0200
commit1f8e94566ebcc1e3986ae739be090e946f26f96e (patch)
tree8fe420af90a956cc513d68a3a9df20a076a4991e
parent4a46e268bd6392e63b29eccf1d0dc57a2a1e3e82 (diff)
downloadperl-1f8e94566ebcc1e3986ae739be090e946f26f96e.tar.gz
Merge ext/IPC-Open2 into ext/IPC-Open3.
IPC::Open2::open2() is implemented as a thin wrapper around IPC::Open3::_open3(), and hence is very tightly coupled to it.
-rw-r--r--MANIFEST4
-rwxr-xr-xPorting/Maintainers.pl7
-rw-r--r--ext/IPC-Open3/lib/IPC/Open2.pm (renamed from ext/IPC-Open2/lib/IPC/Open2.pm)0
-rw-r--r--ext/IPC-Open3/t/IPC-Open2.t (renamed from ext/IPC-Open2/t/IPC-Open2.t)0
-rw-r--r--pod/perldelta.pod7
5 files changed, 9 insertions, 9 deletions
diff --git a/MANIFEST b/MANIFEST
index 33d9bbfdc5..2c7f9bc6cf 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3431,10 +3431,10 @@ ext/I18N-Langinfo/Langinfo.pm I18N::Langinfo
ext/I18N-Langinfo/Langinfo.xs I18N::Langinfo
ext/I18N-Langinfo/Makefile.PL I18N::Langinfo
ext/I18N-Langinfo/t/Langinfo.t See whether I18N::Langinfo works
-ext/IPC-Open2/lib/IPC/Open2.pm Open a two-ended pipe
-ext/IPC-Open2/t/IPC-Open2.t See if IPC::Open2 works
+ext/IPC-Open3/lib/IPC/Open2.pm Open a two-ended pipe
ext/IPC-Open3/lib/IPC/Open3.pm Open a three-ended pipe
ext/IPC-Open3/t/fd.t See if IPC::Open3 works w/ file descriptors
+ext/IPC-Open3/t/IPC-Open2.t See if IPC::Open2 works
ext/IPC-Open3/t/IPC-Open3.t See if IPC::Open3 works
ext/mro/Changes mro extension
ext/mro/mro.pm mro extension
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 3c4b71336b..bd2583a1b3 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1053,13 +1053,6 @@ use File::Glob qw(:case);
'UPSTREAM' => 'cpan',
},
- 'IPC::Open2' =>
- {
- 'MAINTAINER' => 'p5p',
- 'FILES' => q[ext/IPC-Open2],
- 'UPSTREAM' => 'blead',
- },
-
'IPC::Open3' =>
{
'MAINTAINER' => 'p5p',
diff --git a/ext/IPC-Open2/lib/IPC/Open2.pm b/ext/IPC-Open3/lib/IPC/Open2.pm
index 9e27144571..9e27144571 100644
--- a/ext/IPC-Open2/lib/IPC/Open2.pm
+++ b/ext/IPC-Open3/lib/IPC/Open2.pm
diff --git a/ext/IPC-Open2/t/IPC-Open2.t b/ext/IPC-Open3/t/IPC-Open2.t
index fecb209663..fecb209663 100644
--- a/ext/IPC-Open2/t/IPC-Open2.t
+++ b/ext/IPC-Open3/t/IPC-Open2.t
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 0bc47fc50c..8e46a51819 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -734,6 +734,13 @@ USE_LOCALE{,_COLLATE,_CTYPE,_NUMERIC} have been added the output of perl -V
as they have affect the behaviour of the interpreter binary (albeit only
in a small area).
+=item *
+
+The code and tests for L<IPC::Open2> have been moved from F<ext/IPC-Open2>
+into F<ext/IPC-Open3>, as C<IPC::Open2::open2()> is implemented as a thin
+wrapper around C<IPC::Open3::_open3()>, and hence is very tightly coupled to
+it.
+
=back
=head1 Testing