Remove liberror-perl and libsoap-lite-perl.

Try and save other people the potential pain of installing SOAP::Lite;
only UK FixMyStreet and Zurich geocoder use it, so set it as an optional
feature in the cpanfile instead.

2 files changed, 7 insertions, 6 deletions

diff --git a/perllib/FixMyStreet/Geocode/Zurich.pm b/perllib/FixMyStreet/Geocode/Zurich.pm
index 7ba3d27ad..84fd83fc7 100644
--- a/perllib/FixMyStreet/Geocode/Zurich.pm
+++ b/perllib/FixMyStreet/Geocode/Zurich.pm
@@ -16,7 +16,6 @@ use strict;
 use Digest::MD5 qw(md5_hex);
 use File::Path ();
 use Geo::Coordinates::CH1903;
-use SOAP::Lite;
 use Storable;
 use mySociety::Locale;
 
@@ -33,6 +32,8 @@ sub setup_soap {
     my $attr = 'http://ch/geoz/fixmyzuerich/service';
     my $action = "$attr/IFixMyZuerich/";
 
+    require SOAP::Lite;
+
     # Set up the SOAP handler
     $security = SOAP::Header->name("Security")->attr({
         'mustUnderstand' => 'true',
diff --git a/perllib/FixMyStreet/SendReport/EastHants.pm b/perllib/FixMyStreet/SendReport/EastHants.pm
index beab9d55c..44bc084b1 100644
--- a/perllib/FixMyStreet/SendReport/EastHants.pm
+++ b/perllib/FixMyStreet/SendReport/EastHants.pm
@@ -4,11 +4,9 @@ use Moose;
 
 BEGIN { extends 'FixMyStreet::SendReport'; }
 
-# export just what we need as error if we use :try
-use Error qw(try otherwise);
+use Try::Tiny;
 use Encode;
 use mySociety::Web qw(ent);
-use EastHantsWSDL;
 
 sub construct_message {
     my %h = @_;
@@ -37,6 +35,8 @@ sub send {
     # FIXME: should not recreate this each time
     my $eh_service;
 
+    require EastHantsWSDL;
+
     $h->{category} = 'Customer Services' if $h->{category} eq 'Other';
     $h->{message} = construct_message( %$h );
     my $return = 1;
@@ -50,8 +50,8 @@ sub send {
             '', '', '', '', '', '', $message, 'Yes', $h->{image_url}
         );
         $return = 0 if $result eq 'Report received';
-    } otherwise {
-        my $e = shift;
+    } catch {
+        my $e = $_;
         print "Caught an error: $e\n";
         $self->error( "Error sending to East Hants: $e" );
     };