Fix regression with how Vend::Safe performs initialization

In newer versions of Perl (5.18+) `make test` failed due to some odd interactions with Safe and Unicode initialization. The good news is that the failing routines are no longer needed, because Safe.pm now properly sets up Safe compartments with Unicode support without needing our help. Avoid the special-case handling by Interchange when we are using a new enough Safe.pm.
interchange · May 2, 2016 · 672b8a1 · 672b8a1 · hexfusion · May 2, 2016
1 parent 7719042
commit 672b8a1
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/lib/Vend/Safe.pm b/lib/Vend/Safe.pm
@@ -27,6 +27,12 @@ use warnings;
 use Vend::CharSet;
 use Safe;
 
+BEGIN {
+    eval {
+        require version;
+    };
+};
+
 # The L<new> method creates and returns an initialized Safe
 # compartment.  This is mainly provided so there is a single point of
 # modification for all needed Safe.pm initializations.
@@ -35,7 +41,11 @@ sub new {
     my ($invocant, @args) = @_;
 
     my $safe = Safe->new(@args);
-    $invocant->initialize_safe_compartment($safe);
+
+    # Safe started taking better care of Unicode things as of version 2.32
+    if ($] lt '5.009' || version->parse($Safe::VERSION) < version->parse('2.32')) {
+        $invocant->initialize_safe_compartment($safe);
+    }
 
     return $safe;
 }