From bea6fd26dc2f71b7acc8d130357d65e768b36b00 Mon Sep 17 00:00:00 2001
From: James E Keenan <jkeenan@cpan.org>
Date: Mon, 12 Jul 2021 12:45:03 +0000
Subject: [PATCH] Pod-Html: remove commented-out code

Make use of Exporter consistent.
---
 ext/Pod-Html/lib/Pod/Html.pm      | 21 ---------------------
 ext/Pod-Html/lib/Pod/Html/Util.pm |  3 +--
 ext/Pod-Html/t/lib/Testing.pm     |  3 +--
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/ext/Pod-Html/lib/Pod/Html.pm b/ext/Pod-Html/lib/Pod/Html.pm
index 09919cd804ec..9b44a09173a6 100644
--- a/ext/Pod-Html/lib/Pod/Html.pm
+++ b/ext/Pod-Html/lib/Pod/Html.pm
@@ -24,7 +24,6 @@ use Pod::Html::Util qw(
     relativize_url
 );
 use locale; # make \w work right in non-ASCII lands
-use Data::Dumper;
 
 =head1 NAME
 
@@ -239,12 +238,6 @@ This program is distributed under the Artistic License.
 
 =cut
 
-
-my $Podroot;
-
-#my %Pages = ();                 # associative array used to find the location
-                                #   of pages referenced by L<> links.
-
 sub new {
     my $class = shift;
     return bless {}, $class;
@@ -380,12 +373,10 @@ sub refine_globals {
         # Is the above not just "$self->{Htmlfileurl} = $self->{Htmlfile}"?
         $self->{Htmlfileurl} = unixify($self->{Htmlfile});
     }
-    #return $self;
     return { %{$self} };
 }
 
 sub generate_cache {
-    #my ($self, $Pagesref) = @_;
     my $self = shift;
     my $pwd = getcwd();
     chdir($self->{Podroot}) ||
@@ -427,7 +418,6 @@ sub generate_cache {
         print $cache "$key $self->{Pages}->{$key}\n";
     }
     close $cache or die "error closing $self->{Dircache}: $!";
-    #return %{$Pagesref};
 }
 
 sub _transform {
@@ -649,17 +639,6 @@ sub write_file {
     chmod 0644, $self->{Htmlfile} unless $self->{Htmlfile} eq '-';
 }
 
-<<<<<<< HEAD
-=======
-#sub compare {
-#    my ($ha, $hb) = @_;
-#    local $Data::Dumper::Terse  = 1;
-#    local $Data::Dumper::Indent = 0;
-#    local $Data::Dumper::Sortkeys = 1;
-#    return (Dumper($ha) eq Dumper($hb)) ? 1 : 0;
-#}
->>>>>>> b4b3ed877e (Replace _save_pages() with _transform())
-
 package Pod::Simple::XHTML::LocalPodLinks;
 use strict;
 use warnings;
diff --git a/ext/Pod-Html/lib/Pod/Html/Util.pm b/ext/Pod-Html/lib/Pod/Html/Util.pm
index 57153b604e53..57fcab95cffc 100644
--- a/ext/Pod-Html/lib/Pod/Html/Util.pm
+++ b/ext/Pod-Html/lib/Pod/Html/Util.pm
@@ -1,10 +1,9 @@
 package Pod::Html::Util;
 use strict;
-require Exporter;
+use Exporter 'import';
 
 our $VERSION = 1.33; # Please keep in synch with lib/Pod/Html.pm
 $VERSION = eval $VERSION;
-our @ISA = qw(Exporter);
 our @EXPORT_OK = qw(
     anchorify
     html_escape
diff --git a/ext/Pod-Html/t/lib/Testing.pm b/ext/Pod-Html/t/lib/Testing.pm
index c9dbe9d5331f..a30f02af1fcc 100644
--- a/ext/Pod-Html/t/lib/Testing.pm
+++ b/ext/Pod-Html/t/lib/Testing.pm
@@ -1,10 +1,9 @@
 package Testing;
 use 5.10.0;
 use warnings;
-require Exporter;
+use Exporter 'import';
 our $VERSION = 1.33; # Let's keep this same as lib/Pod/Html.pm
 $VERSION = eval $VERSION;
-our @ISA = qw(Exporter);
 our @EXPORT_OK = qw(
     setup_testing_dir
     xconvert