Merge pull request #120 from JRaspass/remove-5.6-hacks

Remove obsolete perl 5.6 hacks

DBI.pm

@@ -1133,10 +1133,6 @@ sub data_string_diff {
 		if !defined $b;
     }
 
-    require utf8;
-    # hack to cater for perl 5.6
-    *utf8::is_utf8 = sub { (DBI::neat(shift)=~/^"/) } unless defined &utf8::is_utf8;
-
     my @a_chars = (utf8::is_utf8($a)) ? unpack("U*", $a) : unpack("C*", $a);
     my @b_chars = (utf8::is_utf8($b)) ? unpack("U*", $b) : unpack("C*", $b);
     my $i = 0;
@@ -1166,11 +1162,6 @@ sub data_string_diff {
 sub data_string_desc {	# describe a data string
     my ($a) = @_;
     require bytes;
-    require utf8;
-
-    # hacks to cater for perl 5.6
-    *utf8::is_utf8 = sub { (DBI::neat(shift)=~/^"/) } unless defined &utf8::is_utf8;
-    *utf8::valid   = sub {                        1 } unless defined &utf8::valid;
 
     # Give sufficient info to help diagnose at least these kinds of situations:
     # - valid UTF8 byte sequence but UTF8 flag not set

lib/DBI/ProxyServer.pm

@@ -23,7 +23,6 @@
 ##############################################################################
 
 
-require 5.004;
 use strict;
 use warnings;
 

lib/DBI/PurePerl.pm

@@ -21,13 +21,6 @@ use warnings;
 use Carp;
 require Symbol;
 
-require utf8;
-*utf8::is_utf8 = sub { # hack for perl 5.6
-    require bytes;
-    return unless defined $_[0];
-    return !(length($_[0]) == bytes::length($_[0]))
-} unless defined &utf8::is_utf8;
-
 $DBI::PurePerl = $ENV{DBI_PUREPERL} || 1;
 $DBI::PurePerl::VERSION = "2.014286";
 

t/80proxy.t

@@ -2,7 +2,6 @@
 # -*- perl -*-
 # vim:sw=4:ts=8
 
-require 5.004;
 use strict;
 use warnings;