From 262c7d9360b23cb06d60f0b0692379555e691274 Mon Sep 17 00:00:00 2001 From: Steve Kemp Date: Mon, 9 Mar 2015 12:52:08 +0000 Subject: Avoid redundent ".to_s" methods. These are not required if the argument is string already, or has a _to_s method which will be automatically invoked by magic. --- lib/custodian/protocoltest/http.rb | 2 +- lib/custodian/protocoltest/ssl.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/custodian/protocoltest') diff --git a/lib/custodian/protocoltest/http.rb b/lib/custodian/protocoltest/http.rb index cc171a6..0d20dfb 100644 --- a/lib/custodian/protocoltest/http.rb +++ b/lib/custodian/protocoltest/http.rb @@ -297,7 +297,7 @@ module Custodian # Nothing to see here..! resolution_errors << resolve_mode rescue => x - errors << "#{protocol_msg}: #{x.class.to_s}: #{x.message}\n #{x.backtrace.join("\n ")}." + errors << "#{protocol_msg}: #{x.class}: #{x.message}\n #{x.backtrace.join("\n ")}." end # diff --git a/lib/custodian/protocoltest/ssl.rb b/lib/custodian/protocoltest/ssl.rb index ab57dff..18da9f1 100644 --- a/lib/custodian/protocoltest/ssl.rb +++ b/lib/custodian/protocoltest/ssl.rb @@ -178,10 +178,10 @@ class SSLCheck ctx = OpenSSL::SSL::SSLContext.new(:SSLv3_client) retry end - self.errors << verbose("*Caught #{err.class}* (#{err.to_s}) when connecting to #{uri.host}:#{uri.port}") + self.errors << verbose("*Caught #{err.class}* (#{err}) when connecting to #{uri.host}:#{uri.port}") rescue StandardError, Timeout::Error => err - self.errors << verbose("*Caught #{err.class}* (#{err.to_s}) when connecting to #{uri.host}:#{uri.port}") + self.errors << verbose("*Caught #{err.class}* (#{err}) when connecting to #{uri.host}:#{uri.port}") ensure s.close if s.respond_to?(:close) and !s.closed? end @@ -227,7 +227,7 @@ class SSLCheck # return true rescue StandardError, Timeout::Error => err - self.errors << verbose("*Caught #{err.class}* (#{err.to_s}) when connecting to #{uri.host}:#{uri.port} using SSLv3") + self.errors << verbose("*Caught #{err.class}* (#{err}) when connecting to #{uri.host}:#{uri.port} using SSLv3") ensure s.close if s.respond_to?(:close) and !s.closed? end @@ -313,7 +313,7 @@ class SSLCheck # including any bundle that has been uploaded. # elsif self.certificate_store.is_a?(OpenSSL::X509::Store) and self.certificate_store.verify(self.certificate) - verbose "Certificate signed by #{self.certificate.issuer.to_s}" + verbose "Certificate signed by #{self.certificate.issuer}" return true # -- cgit v1.2.1