Fix extends to die on failure

diff --git a/lib/File/KDBX/Iterator.pm b/lib/File/KDBX/Iterator.pm
index 8d79b2ade1eeda5002fbc4bb7c590dea0507440c..f661706df50e262900af7590092b51336646ca82 100644 (file)
--- a/lib/File/KDBX/Iterator.pm
+++ b/lib/File/KDBX/Iterator.pm
@@ -7,9 +7,11 @@ use strict;
 use File::KDBX::Error;
 use File::KDBX::Util qw(:class :load :search);
 use Iterator::Simple;
+use Module::Loaded;
 use Ref::Util qw(is_arrayref is_coderef is_scalarref);
 use namespace::clean;
 
+BEGIN { mark_as_loaded('Iterator::Simple::Iterator') }
 extends 'Iterator::Simple::Iterator';
 
 our $VERSION = '999.999'; # VERSION

diff --git a/lib/File/KDBX/Util.pm b/lib/File/KDBX/Util.pm
index a09d2863d9177d69f902140f2159c0083bf50bc0..5b12e9dd1ea525135e29611a258537b33d4193a7 100644 (file)
--- a/lib/File/KDBX/Util.pm
+++ b/lib/File/KDBX/Util.pm
@@ -411,8 +411,7 @@ Set up the current module to inheret from another module.
 sub extends {
     my $parent  = shift;
     my $caller  = caller;
-    # load $parent;
-    eval qq[require $parent];
+    load $parent;
     no strict 'refs'; ## no critic (ProhibitNoStrict)
     @{"${caller}::ISA"} = $parent;
 }