This patch is the beginning of RT#1692, hopefully I got them all, hel…

…p me test, test, test!
rcaputo · Dec 2, 2004 · ea6d5ca · ea6d5ca
1 parent 4b0f284
commit ea6d5ca
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 39 deletions.
diff --git a/lib/POE.pm b/lib/POE.pm
@@ -4,7 +4,7 @@
 package POE;
 
 use strict;
-use Carp;
+use Carp qw( croak );
 
 use vars qw($VERSION $REVISION);
 $VERSION = '0.3004';

diff --git a/lib/POE/API/Ctl.pm b/lib/POE/API/Ctl.pm
@@ -10,7 +10,7 @@ $VERSION = do {my@r=(q$Revision$=~/\d+/g);sprintf"%d."."%04d"x$#r,@r};
 use POE::Kernel;
 use POE::Resource::Controls;
 
-use Carp;
+use Carp qw( carp );
 
 sub import {
     my $package = caller();

diff --git a/lib/POE/Filter/HTTPD.pm b/lib/POE/Filter/HTTPD.pm
@@ -20,11 +20,11 @@ use vars qw($VERSION);
 $VERSION = do {my@r=(q$Revision$=~/\d+/g);sprintf"%d."."%04d"x$#r,@r};
 
 use Carp qw(croak);
-use HTTP::Status;
-use HTTP::Request;
-use HTTP::Response;
+use HTTP::Status qw( RC_BAD_REQUEST RC_OK RC_LENGTH_REQUIRED );
+use HTTP::Request ();
+use HTTP::Response ();
 use HTTP::Date qw(time2str);
-use URI;
+use URI ();
 
 my $HTTP_1_0 = _http_version("HTTP/1.0");
 my $HTTP_1_1 = _http_version("HTTP/1.1");

diff --git a/lib/POE/Kernel.pm b/lib/POE/Kernel.pm
@@ -8,12 +8,12 @@ use vars qw($VERSION);
 $VERSION = do {my@r=(q$Revision$=~/\d+/g);sprintf"%d."."%04d"x$#r,@r};
 
 use POE::Queue::Array;
-use POSIX qw(fcntl_h sys_wait_h);
+use POSIX qw(:fcntl_h :sys_wait_h);
 use Errno qw(ESRCH EINTR ECHILD EPERM EINVAL EEXIST EAGAIN EWOULDBLOCK);
 use Carp qw(carp croak confess cluck);
 use Sys::Hostname qw(hostname);
-use IO::Handle;
-use File::Spec;
+use IO::Handle ();
+use File::Spec ();
 
 # People expect these to be lexical.
 

diff --git a/lib/POE/Pipe.pm b/lib/POE/Pipe.pm
@@ -12,8 +12,11 @@ use vars qw($VERSION);
 $VERSION = do {my@r=(q$Revision$=~/\d+/g);sprintf"%d."."%04d"x$#r,@r};
 
 use Symbol qw(gensym);
-use IO::Socket;
-use POSIX qw(fcntl_h);
+use IO::Socket qw( 	PF_INET SOCK_STREAM SOL_SOCKET SO_REUSEADDR 
+			pack_sockaddr_in unpack_sockaddr_in inet_aton
+			SOMAXCONN SO_ERROR
+		);
+use POSIX qw(:fcntl_h);
 use Errno qw(EINPROGRESS EWOULDBLOCK);
 
 # CygWin seems to have a problem with socketpair() and exec().  When

diff --git a/lib/POE/Pipe/OneWay.pm b/lib/POE/Pipe/OneWay.pm
@@ -11,7 +11,7 @@ use vars qw($VERSION);
 $VERSION = do {my@r=(q$Revision$=~/\d+/g);sprintf"%d."."%04d"x$#r,@r};
 
 use Symbol qw(gensym);
-use IO::Socket;
+use IO::Socket qw( AF_UNIX SOCK_STREAM PF_UNSPEC );
 use POE::Pipe;
 
 @POE::Pipe::OneWay::ISA = qw( POE::Pipe );

diff --git a/lib/POE/Pipe/TwoWay.pm b/lib/POE/Pipe/TwoWay.pm
@@ -11,7 +11,7 @@ use vars qw($VERSION);
 $VERSION = do {my@r=(q$Revision$=~/\d+/g);sprintf"%d."."%04d"x$#r,@r};
 
 use Symbol qw(gensym);
-use IO::Socket;
+use IO::Socket qw( AF_UNIX SOCK_STREAM PF_UNSPEC );
 use POE::Pipe;
 
 @POE::Pipe::TwoWay::ISA = qw( POE::Pipe );

diff --git a/lib/POE/Resource/Controls.pm b/lib/POE/Resource/Controls.pm
@@ -9,7 +9,7 @@ $VERSION = do {my@r=(q$Revision$=~/\d+/g);sprintf"%d."."%04d"x$#r,@r};
 package POE::Kernel;
 
 use strict;
-use Sys::Hostname;
+use Sys::Hostname qw( hostname );
 use Carp qw(croak);
 
 # %kr_magic = (

diff --git a/lib/POE/Wheel/Curses.pm b/lib/POE/Wheel/Curses.pm
@@ -8,9 +8,11 @@ use vars qw($VERSION);
 $VERSION = do {my@r=(q$Revision$=~/\d+/g);sprintf"%d."."%04d"x$#r,@r};
 
 use Carp qw(croak);
-use Curses;
-use POSIX qw(fcntl_h);
-use POE qw(Wheel);
+use Curses qw(	initscr start_color cbreak raw noecho nonl nodelay timeout keypad intrflush
+		meta typeahead mousemask ALL_MOUSE_EVENTS clear refresh endwin COLS
+	);
+use POSIX qw(:fcntl_h);
+use POE qw( Wheel );
 
 
 sub SELF_STATE_READ  () { 0 }

diff --git a/lib/POE/Wheel/FollowTail.pm b/lib/POE/Wheel/FollowTail.pm
@@ -7,11 +7,11 @@ use strict;
 use vars qw($VERSION);
 $VERSION = do {my@r=(q$Revision$=~/\d+/g);sprintf"%d."."%04d"x$#r,@r};
 
-use Carp;
-use Symbol;
+use Carp qw( croak carp );
+use Symbol qw( gensym );
 use POSIX qw(SEEK_SET SEEK_CUR SEEK_END);
 use POE qw(Wheel Driver::SysRW Filter::Line);
-use IO::Handle;
+use IO::Handle ();
 
 sub CRIMSON_SCOPE_HACK ($) { 0 }
 

diff --git a/lib/POE/Wheel/ListenAccept.pm b/lib/POE/Wheel/ListenAccept.pm
@@ -7,12 +7,12 @@ use strict;
 use vars qw($VERSION);
 $VERSION = do {my@r=(q$Revision$=~/\d+/g);sprintf"%d."."%04d"x$#r,@r};
 
-use Carp;
-use Symbol;
+use Carp qw( croak carp );
+use Symbol qw( gensym );
 
-use POSIX qw(fcntl_h);
+use POSIX qw(:fcntl_h);
 use Errno qw(EWOULDBLOCK);
-use POE qw(Wheel);
+use POE qw( Wheel );
 
 sub SELF_HANDLE       () { 0 }
 sub SELF_EVENT_ACCEPT () { 1 }

diff --git a/lib/POE/Wheel/ReadLine.pm b/lib/POE/Wheel/ReadLine.pm
@@ -8,14 +8,14 @@ use bytes; # don't assume UTF while reading bizarre key sequences
 use vars qw($VERSION);
 $VERSION = do {my@r=(q$Revision$=~/\d+/g);sprintf"%d."."%04d"x$#r,@r};
 
-use Carp;
+use Carp qw( croak carp );
 use Symbol qw(gensym);
-use POE qw(Wheel);
-use POSIX;
+use POE qw( Wheel );
+use POSIX ();
 
 # Things we'll need to interact with the terminal.
-use Term::Cap;
-use Term::ReadKey;
+use Term::Cap ();
+use Term::ReadKey qw( ReadKey ReadMode GetTerminalSize );
 
 my $initialised = 0;
 my $termcap;         # Termcap entry.
@@ -729,7 +729,7 @@ sub global_init {
     # the input state engine (so that we have valid values) and
     # before handing control back to the user (so that they get
     # an up-to-date value).
-    ($trk_cols, $trk_rows) = Term::ReadKey::GetTerminalSize($stdout);
+    ($trk_cols, $trk_rows) = GetTerminalSize($stdout);
 
     # Set up console using Term::ReadKey.
     ReadMode('ultra-raw');
@@ -1005,7 +1005,7 @@ sub get {
   return if $self->[SELF_READING_LINE];
   # recheck the terminal size every prompt, in case the size
   # has changed
-  ($trk_cols, $trk_rows) = Term::ReadKey::GetTerminalSize($stdout);
+  ($trk_cols, $trk_rows) = GetTerminalSize($stdout);
 
   # Set up for the read.
   $self->[SELF_READING_LINE]   = 1;
@@ -1730,7 +1730,7 @@ sub rl_accept_line {
     $self->[SELF_READING_LINE] = 0;
     $self->[SELF_HIST_INDEX] = @{$self->[SELF_HIST_LIST]};
     $self->flush_output_buffer;
-    ($trk_cols, $trk_rows) = Term::ReadKey::GetTerminalSize($stdout);
+    ($trk_cols, $trk_rows) = GetTerminalSize($stdout);
     if ($self->[SELF_KEYMAP]->{name} =~ /vi/) {
 	$self->rl_set_keymap('vi-insert');
     }

diff --git a/lib/POE/Wheel/ReadWrite.pm b/lib/POE/Wheel/ReadWrite.pm
@@ -7,7 +7,7 @@ use strict;
 use vars qw($VERSION);
 $VERSION = do {my@r=(q$Revision$=~/\d+/g);sprintf"%d."."%04d"x$#r,@r};
 
-use Carp;
+use Carp qw( croak carp );
 use POE qw(Wheel Driver::SysRW Filter::Line);
 
 # Offsets into $self.

diff --git a/lib/POE/Wheel/SocketFactory.pm b/lib/POE/Wheel/SocketFactory.pm
@@ -8,14 +8,18 @@ use strict;
 use vars qw($VERSION);
 $VERSION = do {my@r=(q$Revision$=~/\d+/g);sprintf"%d."."%04d"x$#r,@r};
 
-use Carp;
-use Symbol;
+use Carp qw( carp croak );
+use Symbol qw( gensym );
 
-use POSIX qw(fcntl_h);
+use POSIX qw(:fcntl_h);
 use Errno qw(EWOULDBLOCK EADDRNOTAVAIL EINPROGRESS EADDRINUSE);
-use Socket;
-use IO::Handle;
-use POE qw(Wheel);
+use Socket qw(	AF_INET SOCK_STREAM SOL_SOCKET AF_UNIX PF_UNIX 
+		PF_INET SOCK_DGRAM SO_ERROR unpack_sockaddr_in 
+		unpack_sockaddr_un PF_UNSPEC SO_REUSEADDR INADDR_ANY 
+		pack_sockaddr_in pack_sockaddr_un inet_aton SOMAXCONN
+	);
+use IO::Handle ();
+use POE qw( Wheel );
 
 sub CRIMSON_SCOPE_HACK ($) { 0 }
 sub DEBUG () { 0 }