From 1764f0df908a7271a1d3204e844de9c5fa374ed7 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 1 Dec 2012 01:31:00 +0000
Subject: [PATCH] Bug 787668: Use |use parent| instead of |use base|
 r/a=LpSolit

git-svn-id: svn://10.0.0.236/trunk@264508 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev                             | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Attachment.pm              | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Auth/Login/CGI.pm          | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Cookie.pm       | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Env.pm          | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Auth/Verify/DB.pm          | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Auth/Verify/RADIUS.pm      | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Bug.pm                     | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/BugUrl.pm                  | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/BugUrl/Bugzilla.pm         | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/BugUrl/Bugzilla/Local.pm   | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/BugUrl/Debian.pm           | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/BugUrl/GitHub.pm           | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/BugUrl/Google.pm           | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/BugUrl/JIRA.pm             | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/BugUrl/Launchpad.pm        | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/BugUrl/MantisBT.pm         | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/BugUrl/SourceForge.pm      | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/BugUrl/Trac.pm             | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/CGI.pm                     | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Classification.pm          | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Comment.pm                 | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Component.pm               | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Config.pm                  | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Config/Common.pm           | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Constants.pm               | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/DB.pm                      | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/DB/Mysql.pm                | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/DB/Oracle.pm               | 4 ++--
 mozilla/webtools/bugzilla/Bugzilla/DB/Pg.pm                   | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Mysql.pm         | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Oracle.pm        | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Pg.pm            | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Sqlite.pm        | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/DB/Sqlite.pm               | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Error.pm                   | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Extension.pm               | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Field.pm                   | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Field/Choice.pm            | 4 ++--
 mozilla/webtools/bugzilla/Bugzilla/Flag.pm                    | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/FlagType.pm                | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Group.pm                   | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Install/CPAN.pm            | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Install/Filesystem.pm      | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Install/Localconfig.pm     | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm    | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm            | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Job/Mailer.pm              | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/JobQueue.pm                | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/JobQueue/Runner.pm         | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Keyword.pm                 | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Mailer.pm                  | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Migrate/Gnats.pm           | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Milestone.pm               | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Product.pm                 | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/RNG.pm                     | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Report.pm                  | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Search.pm                  | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Search/Condition.pm        | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Search/Quicksearch.pm      | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Search/Recent.pm           | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Search/Saved.pm            | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Send/Sendmail.pm           | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Status.pm                  | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Template.pm                | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Template/Context.pm        | 2 +-
 .../webtools/bugzilla/Bugzilla/Template/Plugin/Bugzilla.pm    | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Template/Plugin/Hook.pm    | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Token.pm                   | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/User.pm                    | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/User/Setting.pm            | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/User/Setting/Lang.pm       | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/User/Setting/Skin.pm       | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/User/Setting/Timezone.pm   | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/UserAgent.pm               | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Util.pm                    | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Version.pm                 | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/WebService/Bug.pm          | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/WebService/Bugzilla.pm     | 2 +-
 .../webtools/bugzilla/Bugzilla/WebService/Classification.pm   | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/WebService/Constants.pm    | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/WebService/Group.pm        | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/WebService/Product.pm      | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/WebService/README          | 2 +-
 .../webtools/bugzilla/Bugzilla/WebService/Server/XMLRPC.pm    | 4 ++--
 mozilla/webtools/bugzilla/Bugzilla/WebService/User.pm         | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/WebService/Util.pm         | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Whine.pm                   | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Whine/Query.pm             | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Whine/Schedule.pm          | 2 +-
 mozilla/webtools/bugzilla/contrib/extension-convert.pl        | 2 +-
 .../webtools/bugzilla/docs/lib/Pod/Simple/HTML/Bugzilla.pm    | 2 +-
 .../bugzilla/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm        | 2 +-
 mozilla/webtools/bugzilla/extensions/BmpConvert/Extension.pm  | 2 +-
 mozilla/webtools/bugzilla/extensions/Example/Extension.pm     | 2 +-
 .../webtools/bugzilla/extensions/Example/lib/Auth/Login.pm    | 2 +-
 .../webtools/bugzilla/extensions/Example/lib/Auth/Verify.pm   | 2 +-
 .../webtools/bugzilla/extensions/Example/lib/WebService.pm    | 2 +-
 mozilla/webtools/bugzilla/extensions/MoreBugUrl/Extension.pm  | 2 +-
 .../bugzilla/extensions/MoreBugUrl/lib/GetSatisfaction.pm     | 2 +-
 mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/PHP.pm    | 2 +-
 mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/RT.pm     | 2 +-
 .../bugzilla/extensions/MoreBugUrl/lib/ReviewBoard.pm         | 2 +-
 .../webtools/bugzilla/extensions/MoreBugUrl/lib/Rietveld.pm   | 2 +-
 mozilla/webtools/bugzilla/extensions/OldBugMove/Extension.pm  | 2 +-
 mozilla/webtools/bugzilla/extensions/Voting/Extension.pm      | 2 +-
 mozilla/webtools/bugzilla/mod_perl.pl                         | 2 +-
 mozilla/webtools/bugzilla/t/010dependencies.t                 | 4 ++--
 mozilla/webtools/bugzilla/t/Support/Templates.pm              | 2 +-
 .../bugzilla/template/en/default/extensions/extension.pm.tmpl | 2 +-
 .../bugzilla/template/en/default/extensions/util.pm.tmpl      | 2 +-
 .../webtools/bugzilla/xt/lib/Bugzilla/Test/Search/AndTest.pm  | 2 +-
 .../bugzilla/xt/lib/Bugzilla/Test/Search/Constants.pm         | 2 +-
 .../bugzilla/xt/lib/Bugzilla/Test/Search/CustomTest.pm        | 2 +-
 .../bugzilla/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm   | 2 +-
 .../bugzilla/xt/lib/Bugzilla/Test/Search/InjectionTest.pm     | 2 +-
 .../webtools/bugzilla/xt/lib/Bugzilla/Test/Search/NotTest.pm  | 2 +-
 .../webtools/bugzilla/xt/lib/Bugzilla/Test/Search/OrTest.pm   | 2 +-
 118 files changed, 122 insertions(+), 122 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index fcbd2c237b3..063c87938f5 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8498
\ No newline at end of file
+8499
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Attachment.pm b/mozilla/webtools/bugzilla/Bugzilla/Attachment.pm
index 0cec2170897..3dbd4ce6dab 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Attachment.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Attachment.pm
@@ -46,7 +46,7 @@ use Bugzilla::Hook;
 use File::Copy;
 use List::Util qw(max);
 
-use base qw(Bugzilla::Object);
+use parent qw(Bugzilla::Object);
 
 ###############################
 ####    Initialization     ####
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/CGI.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/CGI.pm
index a4fb3aea2e1..a55275a545c 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/CGI.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/CGI.pm
@@ -10,7 +10,7 @@ package Bugzilla::Auth::Login::CGI;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Auth::Login);
+use parent qw(Bugzilla::Auth::Login);
 use constant user_can_create_account => 1;
 
 use Bugzilla::Constants;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Cookie.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Cookie.pm
index 1f6f83f5e5f..56bc34f406d 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Cookie.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Cookie.pm
@@ -10,7 +10,7 @@ package Bugzilla::Auth::Login::Cookie;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Auth::Login);
+use parent qw(Bugzilla::Auth::Login);
 
 use Bugzilla::Constants;
 use Bugzilla::Util;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Env.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Env.pm
index 9b24c0edc18..51261e6b9b1 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Env.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth/Login/Env.pm
@@ -10,7 +10,7 @@ package Bugzilla::Auth::Login::Env;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Auth::Login);
+use parent qw(Bugzilla::Auth::Login);
 
 use Bugzilla::Constants;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/Verify/DB.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/Verify/DB.pm
index dc074b20ac6..2ad98874daa 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth/Verify/DB.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth/Verify/DB.pm
@@ -10,7 +10,7 @@ package Bugzilla::Auth::Verify::DB;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Auth::Verify);
+use parent qw(Bugzilla::Auth::Verify);
 
 use Bugzilla::Constants;
 use Bugzilla::Token;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Auth/Verify/RADIUS.pm b/mozilla/webtools/bugzilla/Bugzilla/Auth/Verify/RADIUS.pm
index 9fecec77e81..e5157c68f4c 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Auth/Verify/RADIUS.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Auth/Verify/RADIUS.pm
@@ -10,7 +10,7 @@ package Bugzilla::Auth::Verify::RADIUS;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Auth::Verify);
+use parent qw(Bugzilla::Auth::Verify);
 
 use Bugzilla::Constants;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Bug.pm b/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
index e06213b7d5a..f8b4d2142c2 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
@@ -36,7 +36,7 @@ use URI;
 use URI::QueryParam;
 use Scalar::Util qw(blessed);
 
-use base qw(Bugzilla::Object Exporter);
+use parent qw(Bugzilla::Object Exporter);
 @Bugzilla::Bug::EXPORT = qw(
     bug_alias_to_id
     LogActivityEntry
diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugUrl.pm b/mozilla/webtools/bugzilla/Bugzilla/BugUrl.pm
index 2074a3667b1..df72d9cf788 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugUrl.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugUrl.pm
@@ -10,7 +10,7 @@ package Bugzilla::BugUrl;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Object);
+use parent qw(Bugzilla::Object);
 
 use Bugzilla::Util;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Bugzilla.pm b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Bugzilla.pm
index 8e2f372268a..db132eefff1 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Bugzilla.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Bugzilla.pm
@@ -10,7 +10,7 @@ package Bugzilla::BugUrl::Bugzilla;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::BugUrl);
+use parent qw(Bugzilla::BugUrl);
 
 use Bugzilla::Error;
 use Bugzilla::Util;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Bugzilla/Local.pm b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Bugzilla/Local.pm
index 360d5dd974e..7381d561030 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Bugzilla/Local.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Bugzilla/Local.pm
@@ -10,7 +10,7 @@ package Bugzilla::BugUrl::Bugzilla::Local;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::BugUrl::Bugzilla);
+use parent qw(Bugzilla::BugUrl::Bugzilla);
 
 use Bugzilla::Error;
 use Bugzilla::Util;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Debian.pm b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Debian.pm
index f791a437ef4..7ab8bf17365 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Debian.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Debian.pm
@@ -10,7 +10,7 @@ package Bugzilla::BugUrl::Debian;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::BugUrl);
+use parent qw(Bugzilla::BugUrl);
 
 ###############################
 ####        Methods        ####
diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/GitHub.pm b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/GitHub.pm
index 1dc325c8063..dbcaf655f3a 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/GitHub.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/GitHub.pm
@@ -10,7 +10,7 @@ package Bugzilla::BugUrl::GitHub;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::BugUrl);
+use parent qw(Bugzilla::BugUrl);
 
 ###############################
 ####        Methods        ####
diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Google.pm b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Google.pm
index 809c92ccab7..eb9aa88f285 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Google.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Google.pm
@@ -10,7 +10,7 @@ package Bugzilla::BugUrl::Google;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::BugUrl);
+use parent qw(Bugzilla::BugUrl);
 
 ###############################
 ####        Methods        ####
diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/JIRA.pm b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/JIRA.pm
index d9614c4bdc0..e358ff43940 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/JIRA.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/JIRA.pm
@@ -10,7 +10,7 @@ package Bugzilla::BugUrl::JIRA;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::BugUrl);
+use parent qw(Bugzilla::BugUrl);
 
 ###############################
 ####        Methods        ####
diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Launchpad.pm b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Launchpad.pm
index f858f289513..43c5c57d95a 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Launchpad.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Launchpad.pm
@@ -10,7 +10,7 @@ package Bugzilla::BugUrl::Launchpad;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::BugUrl);
+use parent qw(Bugzilla::BugUrl);
 
 ###############################
 ####        Methods        ####
diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/MantisBT.pm b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/MantisBT.pm
index d774eca109c..8dffabcbebc 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/MantisBT.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/MantisBT.pm
@@ -10,7 +10,7 @@ package Bugzilla::BugUrl::MantisBT;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::BugUrl);
+use parent qw(Bugzilla::BugUrl);
 
 ###############################
 ####        Methods        ####
diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/SourceForge.pm b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/SourceForge.pm
index ee9a3e7ca23..90a7ca6a581 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/SourceForge.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/SourceForge.pm
@@ -10,7 +10,7 @@ package Bugzilla::BugUrl::SourceForge;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::BugUrl);
+use parent qw(Bugzilla::BugUrl);
 
 ###############################
 ####        Methods        ####
diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Trac.pm b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Trac.pm
index ddad281feee..edb18e8fd2c 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Trac.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Trac.pm
@@ -10,7 +10,7 @@ package Bugzilla::BugUrl::Trac;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::BugUrl);
+use parent qw(Bugzilla::BugUrl);
 
 ###############################
 ####        Methods        ####
diff --git a/mozilla/webtools/bugzilla/Bugzilla/CGI.pm b/mozilla/webtools/bugzilla/Bugzilla/CGI.pm
index e0953d4f652..cb92800f109 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/CGI.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/CGI.pm
@@ -10,7 +10,7 @@ package Bugzilla::CGI;
 use 5.10.1;
 use strict;
 
-use base qw(CGI);
+use parent qw(CGI);
 
 use Bugzilla::Constants;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Classification.pm b/mozilla/webtools/bugzilla/Bugzilla/Classification.pm
index 27a59fa9711..771a894b4ab 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Classification.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Classification.pm
@@ -16,7 +16,7 @@ use Bugzilla::Util;
 use Bugzilla::Error;
 use Bugzilla::Product;
 
-use base qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object Exporter);
+use parent qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object Exporter);
 @Bugzilla::Classification::EXPORT = qw(sort_products_by_classification);
 
 ###############################
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Comment.pm b/mozilla/webtools/bugzilla/Bugzilla/Comment.pm
index 0851d76438d..caefb2d6d28 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Comment.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Comment.pm
@@ -10,7 +10,7 @@ package Bugzilla::Comment;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Object);
+use parent qw(Bugzilla::Object);
 
 use Bugzilla::Attachment;
 use Bugzilla::Constants;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Component.pm b/mozilla/webtools/bugzilla/Bugzilla/Component.pm
index e559ba1a2a1..53a6f216c86 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Component.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Component.pm
@@ -10,7 +10,7 @@ package Bugzilla::Component;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object);
+use parent qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object);
 
 use Bugzilla::Constants;
 use Bugzilla::Util;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config.pm b/mozilla/webtools/bugzilla/Bugzilla/Config.pm
index 227d07c01aa..69becbf95d3 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config.pm
@@ -10,7 +10,7 @@ package Bugzilla::Config;
 use 5.10.1;
 use strict;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 use Bugzilla::Constants;
 use Bugzilla::Hook;
 use Data::Dumper;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/Common.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/Common.pm
index 75f6e0ea2a4..64c7ebcbb59 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/Common.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/Common.pm
@@ -19,7 +19,7 @@ use Bugzilla::Field;
 use Bugzilla::Group;
 use Bugzilla::Status;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 @Bugzilla::Config::Common::EXPORT =
     qw(check_multi check_numeric check_regexp check_url check_group
        check_sslbase check_priority check_severity check_platform
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Constants.pm b/mozilla/webtools/bugzilla/Bugzilla/Constants.pm
index 3a95e30f3a1..5af1718787f 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Constants.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Constants.pm
@@ -10,7 +10,7 @@ package Bugzilla::Constants;
 use 5.10.1;
 use strict;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 
 # For bz_locations
 use File::Basename;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/DB.pm b/mozilla/webtools/bugzilla/Bugzilla/DB.pm
index bdda889b3d5..f5320cb7fc5 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/DB.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/DB.pm
@@ -13,7 +13,7 @@ use strict;
 use DBI;
 
 # Inherit the DB class from DBI::db.
-use base qw(DBI::db);
+use parent -norequire, qw(DBI::db);
 
 use Bugzilla::Constants;
 use Bugzilla::Install::Requirements;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/DB/Mysql.pm b/mozilla/webtools/bugzilla/Bugzilla/DB/Mysql.pm
index 3be58767bf8..78d0908fac2 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/DB/Mysql.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/DB/Mysql.pm
@@ -24,7 +24,7 @@ package Bugzilla::DB::Mysql;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::DB);
+use parent qw(Bugzilla::DB);
 
 use Bugzilla::Constants;
 use Bugzilla::Install::Util qw(install_string);
diff --git a/mozilla/webtools/bugzilla/Bugzilla/DB/Oracle.pm b/mozilla/webtools/bugzilla/Bugzilla/DB/Oracle.pm
index 01c37a02882..aaf289b41dc 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/DB/Oracle.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/DB/Oracle.pm
@@ -24,7 +24,7 @@ package Bugzilla::DB::Oracle;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::DB);
+use parent qw(Bugzilla::DB);
 
 use DBD::Oracle;
 use DBD::Oracle qw(:ora_types);
@@ -720,7 +720,7 @@ package Bugzilla::DB::Oracle::st;
 use 5.10.1;
 use strict;
 
-use base qw(DBI::st);
+use parent qw(DBI::st);
  
 sub fetchrow_arrayref {
     my $self = shift;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/DB/Pg.pm b/mozilla/webtools/bugzilla/Bugzilla/DB/Pg.pm
index bd3593cc531..890b19089f1 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/DB/Pg.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/DB/Pg.pm
@@ -28,7 +28,7 @@ use Bugzilla::Error;
 use DBD::Pg;
 
 # This module extends the DB interface via inheritance
-use base qw(Bugzilla::DB);
+use parent qw(Bugzilla::DB);
 
 use constant BLOB_TYPE => { pg_type => DBD::Pg::PG_BYTEA };
 
diff --git a/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Mysql.pm b/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Mysql.pm
index 1275b2a8113..d448647919d 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Mysql.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Mysql.pm
@@ -18,7 +18,7 @@ use strict;
 
 use Bugzilla::Error;
 
-use base qw(Bugzilla::DB::Schema);
+use parent qw(Bugzilla::DB::Schema);
 
 # This is for column_info_to_column, to know when a tinyint is a 
 # boolean and when it's really a tinyint. This only has to be accurate
diff --git a/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Oracle.pm b/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Oracle.pm
index 2edc6e3a64a..27502795494 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Oracle.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Oracle.pm
@@ -16,7 +16,7 @@ package Bugzilla::DB::Schema::Oracle;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::DB::Schema);
+use parent qw(Bugzilla::DB::Schema);
 use Carp qw(confess);
 use Bugzilla::Util;
 
diff --git a/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Pg.pm b/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Pg.pm
index 8e90f73f94d..206a53def34 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Pg.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Pg.pm
@@ -16,7 +16,7 @@ package Bugzilla::DB::Schema::Pg;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::DB::Schema);
+use parent qw(Bugzilla::DB::Schema);
 use Storable qw(dclone);
 
 #------------------------------------------------------------------------------
diff --git a/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Sqlite.pm b/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Sqlite.pm
index 4423fae19ff..893e2387d84 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Sqlite.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/DB/Schema/Sqlite.pm
@@ -10,7 +10,7 @@ package Bugzilla::DB::Schema::Sqlite;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::DB::Schema);
+use parent qw(Bugzilla::DB::Schema);
 
 use Bugzilla::Error;
 use Bugzilla::Util qw(generate_random_password);
diff --git a/mozilla/webtools/bugzilla/Bugzilla/DB/Sqlite.pm b/mozilla/webtools/bugzilla/Bugzilla/DB/Sqlite.pm
index 0055f3884b1..8da73ae66ad 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/DB/Sqlite.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/DB/Sqlite.pm
@@ -10,7 +10,7 @@ package Bugzilla::DB::Sqlite;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::DB);
+use parent qw(Bugzilla::DB);
 
 use Bugzilla::Constants;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Error.pm b/mozilla/webtools/bugzilla/Bugzilla/Error.pm
index 03fc8d6428a..d64219e87c8 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Error.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Error.pm
@@ -10,7 +10,7 @@ package Bugzilla::Error;
 use 5.10.1;
 use strict;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 
 @Bugzilla::Error::EXPORT = qw(ThrowCodeError ThrowTemplateError ThrowUserError);
 
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Extension.pm b/mozilla/webtools/bugzilla/Bugzilla/Extension.pm
index aaffe6e2a03..53bf6cd6633 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Extension.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Extension.pm
@@ -240,7 +240,7 @@ F<extensions/Foo.pm>:
 
  package Bugzilla::Extension::Foo
  use strict;
- use base qw(Bugzilla::Extension);
+ use parent qw(Bugzilla::Extension);
 
  our $VERSION = '0.02';
  use constant NAME => 'Foo';
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Field.pm b/mozilla/webtools/bugzilla/Bugzilla/Field.pm
index 36abc2a996a..14888287a7c 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Field.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Field.pm
@@ -60,7 +60,7 @@ package Bugzilla::Field;
 use 5.10.1;
 use strict;
 
-use base qw(Exporter Bugzilla::Object);
+use parent qw(Exporter Bugzilla::Object);
 @Bugzilla::Field::EXPORT = qw(check_field get_field_id get_legal_field_values);
 
 use Bugzilla::Constants;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Field/Choice.pm b/mozilla/webtools/bugzilla/Bugzilla/Field/Choice.pm
index bbf96beb94c..b3bca0dd281 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Field/Choice.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Field/Choice.pm
@@ -10,7 +10,7 @@ package Bugzilla::Field::Choice;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object);
+use parent qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object);
 
 use Bugzilla::Config qw(SetParam write_params);
 use Bugzilla::Constants;
@@ -95,7 +95,7 @@ sub type {
     if (!defined *{"${package}::DB_TABLE"}) {
         eval <<EOC;
             package $package;
-            use base qw(Bugzilla::Field::Choice);
+            use parent qw(Bugzilla::Field::Choice);
             use constant DB_TABLE => '$field_name';
 EOC
     }
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Flag.pm b/mozilla/webtools/bugzilla/Bugzilla/Flag.pm
index 8ad48cce69a..9073d349ed9 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Flag.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Flag.pm
@@ -50,7 +50,7 @@ use Bugzilla::Mailer;
 use Bugzilla::Constants;
 use Bugzilla::Field;
 
-use base qw(Bugzilla::Object Exporter);
+use parent qw(Bugzilla::Object Exporter);
 @Bugzilla::Flag::EXPORT = qw(SKIP_REQUESTEE_ON_ERROR);
 
 ###############################
diff --git a/mozilla/webtools/bugzilla/Bugzilla/FlagType.pm b/mozilla/webtools/bugzilla/Bugzilla/FlagType.pm
index 9e6dfe1e1c7..5fee86b300b 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/FlagType.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/FlagType.pm
@@ -41,7 +41,7 @@ use Bugzilla::Group;
 
 use Email::Address;
 
-use base qw(Bugzilla::Object);
+use parent qw(Bugzilla::Object);
 
 ###############################
 ####    Initialization     ####
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Group.pm b/mozilla/webtools/bugzilla/Bugzilla/Group.pm
index 70df15c8051..25a792417a0 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Group.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Group.pm
@@ -10,7 +10,7 @@ package Bugzilla::Group;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Object);
+use parent qw(Bugzilla::Object);
 
 use Bugzilla::Constants;
 use Bugzilla::Util;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install/CPAN.pm b/mozilla/webtools/bugzilla/Bugzilla/Install/CPAN.pm
index 0d56ead6d25..d79b292f5a3 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Install/CPAN.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Install/CPAN.pm
@@ -10,7 +10,7 @@ package Bugzilla::Install::CPAN;
 use 5.10.1;
 use strict;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 our @EXPORT = qw(
     BZ_LIB
 
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install/Filesystem.pm b/mozilla/webtools/bugzilla/Bugzilla/Install/Filesystem.pm
index 04f32313b23..0f9df67a8de 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Install/Filesystem.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Install/Filesystem.pm
@@ -33,7 +33,7 @@ use File::Spec;
 use IO::File;
 use POSIX ();
 
-use base qw(Exporter);
+use parent qw(Exporter);
 our @EXPORT = qw(
     update_filesystem
     create_htaccess
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install/Localconfig.pm b/mozilla/webtools/bugzilla/Bugzilla/Install/Localconfig.pm
index 4e54da3cfa0..3fa25372981 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Install/Localconfig.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Install/Localconfig.pm
@@ -27,7 +27,7 @@ use File::Basename qw(dirname);
 use Safe;
 use Term::ANSIColor;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 
 our @EXPORT_OK = qw(
     read_localconfig
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm b/mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm
index c446e3834d1..9602d0d2876 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm
@@ -23,7 +23,7 @@ use List::Util qw(max);
 use Safe;
 use Term::ANSIColor;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 our @EXPORT = qw(
     REQUIRED_MODULES
     OPTIONAL_MODULES
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm b/mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm
index 80ebc2a88c1..7a7611bd195 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm
@@ -24,7 +24,7 @@ use Scalar::Util qw(tainted);
 use Term::ANSIColor qw(colored);
 use PerlIO;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 our @EXPORT_OK = qw(
     bin_loc
     get_version_and_os
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Job/Mailer.pm b/mozilla/webtools/bugzilla/Bugzilla/Job/Mailer.pm
index 69f4be2e5eb..3d52f84287d 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Job/Mailer.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Job/Mailer.pm
@@ -11,7 +11,7 @@ use 5.10.1;
 use strict;
 
 use Bugzilla::Mailer;
-BEGIN { eval "use base qw(TheSchwartz::Worker)"; }
+BEGIN { eval "use parent qw(TheSchwartz::Worker)"; }
 
 # The longest we expect a job to possibly take, in seconds.
 use constant grab_for => 300;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/JobQueue.pm b/mozilla/webtools/bugzilla/Bugzilla/JobQueue.pm
index 19f8339780b..519313448ce 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/JobQueue.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/JobQueue.pm
@@ -13,7 +13,7 @@ use strict;
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Install::Util qw(install_string);
-use base qw(TheSchwartz);
+use parent qw(TheSchwartz);
 
 # This maps job names for Bugzilla::JobQueue to the appropriate modules.
 # If you add new types of jobs, you should add a mapping here.
diff --git a/mozilla/webtools/bugzilla/Bugzilla/JobQueue/Runner.pm b/mozilla/webtools/bugzilla/Bugzilla/JobQueue/Runner.pm
index 15c82f62249..7ab4f7f1a9d 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/JobQueue/Runner.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/JobQueue/Runner.pm
@@ -22,7 +22,7 @@ use Pod::Usage;
 use Bugzilla::Constants;
 use Bugzilla::JobQueue;
 use Bugzilla::Util qw(get_text);
-BEGIN { eval "use base qw(Daemon::Generic)"; }
+BEGIN { eval "use parent qw(Daemon::Generic)"; }
 
 our $VERSION = BUGZILLA_VERSION;
 
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Keyword.pm b/mozilla/webtools/bugzilla/Bugzilla/Keyword.pm
index 270048d2b48..aedc6bcfc7c 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Keyword.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Keyword.pm
@@ -10,7 +10,7 @@ package Bugzilla::Keyword;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Object);
+use parent qw(Bugzilla::Object);
 
 use Bugzilla::Error;
 use Bugzilla::Util;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm b/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm
index 4a10688c39b..d9aa9edc927 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm
@@ -10,7 +10,7 @@ package Bugzilla::Mailer;
 use 5.10.1;
 use strict;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 @Bugzilla::Mailer::EXPORT = qw(MessageToMTA build_thread_marker);
 
 use Bugzilla::Constants;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Migrate/Gnats.pm b/mozilla/webtools/bugzilla/Bugzilla/Migrate/Gnats.pm
index 2e0784ac54a..2778d28cc8a 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Migrate/Gnats.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Migrate/Gnats.pm
@@ -10,7 +10,7 @@ package Bugzilla::Migrate::Gnats;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Migrate);
+use parent qw(Bugzilla::Migrate);
 
 use Bugzilla::Constants;
 use Bugzilla::Install::Util qw(indicate_progress);
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Milestone.pm b/mozilla/webtools/bugzilla/Bugzilla/Milestone.pm
index 1eb04bd0d50..4f262fd2ee9 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Milestone.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Milestone.pm
@@ -10,7 +10,7 @@ package Bugzilla::Milestone;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Object);
+use parent qw(Bugzilla::Object);
 
 use Bugzilla::Constants;
 use Bugzilla::Util;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Product.pm b/mozilla/webtools/bugzilla/Bugzilla/Product.pm
index 34672720336..e2c01151a2d 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Product.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Product.pm
@@ -10,7 +10,7 @@ package Bugzilla::Product;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object);
+use parent qw(Bugzilla::Field::ChoiceInterface Bugzilla::Object);
 
 use Bugzilla::Constants;
 use Bugzilla::Util;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/RNG.pm b/mozilla/webtools/bugzilla/Bugzilla/RNG.pm
index c3f112007c8..14b83167222 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/RNG.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/RNG.pm
@@ -10,7 +10,7 @@ package Bugzilla::RNG;
 use 5.10.1;
 use strict;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 use Bugzilla::Constants qw(ON_WINDOWS);
 
 use Math::Random::ISAAC;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Report.pm b/mozilla/webtools/bugzilla/Bugzilla/Report.pm
index 03c054f57cc..fe2b826614f 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Report.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Report.pm
@@ -10,7 +10,7 @@ package Bugzilla::Report;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Object);
+use parent qw(Bugzilla::Object);
 
 use Bugzilla::CGI;
 use Bugzilla::Constants;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Search.pm b/mozilla/webtools/bugzilla/Bugzilla/Search.pm
index d4b74d187c1..22e837d462d 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Search.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Search.pm
@@ -10,7 +10,7 @@ package Bugzilla::Search;
 use 5.10.1;
 use strict;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 @Bugzilla::Search::EXPORT = qw(
     IsValidQueryType
     split_order_term
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Search/Condition.pm b/mozilla/webtools/bugzilla/Bugzilla/Search/Condition.pm
index 50d8258ead6..4975775af31 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Search/Condition.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Search/Condition.pm
@@ -10,7 +10,7 @@ package Bugzilla::Search::Condition;
 use 5.10.1;
 use strict;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 our @EXPORT_OK = qw(condition);
 
 sub new {
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Search/Quicksearch.pm b/mozilla/webtools/bugzilla/Bugzilla/Search/Quicksearch.pm
index 311ef751a00..fc109a64014 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Search/Quicksearch.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Search/Quicksearch.pm
@@ -21,7 +21,7 @@ use List::Util qw(min max);
 use List::MoreUtils qw(firstidx);
 use Text::ParseWords qw(parse_line);
 
-use base qw(Exporter);
+use parent qw(Exporter);
 @Bugzilla::Search::Quicksearch::EXPORT = qw(quicksearch);
 
 # Custom mappings for some fields.
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Search/Recent.pm b/mozilla/webtools/bugzilla/Bugzilla/Search/Recent.pm
index af426ab7491..6d349d129dc 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Search/Recent.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Search/Recent.pm
@@ -10,7 +10,7 @@ package Bugzilla::Search::Recent;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Object);
+use parent qw(Bugzilla::Object);
 
 use Bugzilla::Constants;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Search/Saved.pm b/mozilla/webtools/bugzilla/Bugzilla/Search/Saved.pm
index 245cde37f40..e81035adadc 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Search/Saved.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Search/Saved.pm
@@ -10,7 +10,7 @@ package Bugzilla::Search::Saved;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Object);
+use parent qw(Bugzilla::Object);
 
 use Bugzilla::CGI;
 use Bugzilla::Constants;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Send/Sendmail.pm b/mozilla/webtools/bugzilla/Bugzilla/Send/Sendmail.pm
index 4cf9b88f1ff..9496ff97cf9 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Send/Sendmail.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Send/Sendmail.pm
@@ -10,7 +10,7 @@ package Bugzilla::Send::Sendmail;
 use 5.10.1;
 use strict;
 
-use base qw(Email::Send::Sendmail);
+use parent qw(Email::Send::Sendmail);
 
 use Return::Value;
 use Symbol qw(gensym);
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Status.pm b/mozilla/webtools/bugzilla/Bugzilla/Status.pm
index e1d44a60377..964df90708a 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Status.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Status.pm
@@ -14,7 +14,7 @@ use strict;
 # ChoiceInterface, because a bug status literally is a special type
 # of Field::Choice, not just an object that happens to have the same
 # methods.
-use base qw(Bugzilla::Field::Choice Exporter);
+use parent qw(Bugzilla::Field::Choice Exporter);
 @Bugzilla::Status::EXPORT = qw(
     BUG_STATE_OPEN
     SPECIAL_STATUS_WORKFLOW_ACTIONS
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Template.pm b/mozilla/webtools/bugzilla/Bugzilla/Template.pm
index 8ddd0a5df66..a2fc814891b 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Template.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Template.pm
@@ -34,7 +34,7 @@ use IO::Dir;
 use List::MoreUtils qw(firstidx);
 use Scalar::Util qw(blessed);
 
-use base qw(Template);
+use parent qw(Template);
 
 use constant FORMAT_TRIPLE => '%19s|%-28s|%-28s';
 use constant FORMAT_3_SIZE => [19,28,28];
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Template/Context.pm b/mozilla/webtools/bugzilla/Bugzilla/Template/Context.pm
index 61fcba4d6ae..ce1718e0fbd 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Template/Context.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Template/Context.pm
@@ -11,7 +11,7 @@ package Bugzilla::Template::Context;
 use 5.10.1;
 use strict;
 
-use base qw(Template::Context);
+use parent qw(Template::Context);
 
 use Bugzilla::Hook;
 use Scalar::Util qw(blessed);
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Template/Plugin/Bugzilla.pm b/mozilla/webtools/bugzilla/Bugzilla/Template/Plugin/Bugzilla.pm
index 044c9eed12d..f0de2ed4d18 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Template/Plugin/Bugzilla.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Template/Plugin/Bugzilla.pm
@@ -10,7 +10,7 @@ package Bugzilla::Template::Plugin::Bugzilla;
 use 5.10.1;
 use strict;
 
-use base qw(Template::Plugin);
+use parent qw(Template::Plugin);
 
 use Bugzilla;
 
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Template/Plugin/Hook.pm b/mozilla/webtools/bugzilla/Bugzilla/Template/Plugin/Hook.pm
index 52b3703dce2..19260f0057f 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Template/Plugin/Hook.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Template/Plugin/Hook.pm
@@ -10,7 +10,7 @@ package Bugzilla::Template::Plugin::Hook;
 use 5.10.1;
 use strict;
 
-use base qw(Template::Plugin);
+use parent qw(Template::Plugin);
 
 use Bugzilla::Constants;
 use Bugzilla::Install::Util qw(template_include_path); 
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Token.pm b/mozilla/webtools/bugzilla/Bugzilla/Token.pm
index a5bf9e0a349..183c11f96ed 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Token.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Token.pm
@@ -21,7 +21,7 @@ use Date::Parse;
 use File::Basename;
 use Digest::SHA qw(hmac_sha256_base64);
 
-use base qw(Exporter);
+use parent qw(Exporter);
 
 @Bugzilla::Token::EXPORT = qw(issue_session_token check_token_data delete_token
                               issue_hash_token check_hash_token);
diff --git a/mozilla/webtools/bugzilla/Bugzilla/User.pm b/mozilla/webtools/bugzilla/Bugzilla/User.pm
index 14860872245..5e39eb49a82 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/User.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/User.pm
@@ -27,7 +27,7 @@ use Storable qw(dclone);
 use URI;
 use URI::QueryParam;
 
-use base qw(Bugzilla::Object Exporter);
+use parent qw(Bugzilla::Object Exporter);
 @Bugzilla::User::EXPORT = qw(is_available_username
     login_to_id user_id_to_login validate_password
     USER_MATCH_MULTIPLE USER_MATCH_FAILED USER_MATCH_SUCCESS
diff --git a/mozilla/webtools/bugzilla/Bugzilla/User/Setting.pm b/mozilla/webtools/bugzilla/Bugzilla/User/Setting.pm
index 52a5ff5aa43..451e946f774 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/User/Setting.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/User/Setting.pm
@@ -11,7 +11,7 @@ package Bugzilla::User::Setting;
 use 5.10.1;
 use strict;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 
 
 # Module stuff
diff --git a/mozilla/webtools/bugzilla/Bugzilla/User/Setting/Lang.pm b/mozilla/webtools/bugzilla/Bugzilla/User/Setting/Lang.pm
index 0dcec9aa1be..4465185e3ff 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/User/Setting/Lang.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/User/Setting/Lang.pm
@@ -10,7 +10,7 @@ package Bugzilla::User::Setting::Lang;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::User::Setting);
+use parent qw(Bugzilla::User::Setting);
 
 use Bugzilla::Constants;
 
diff --git a/mozilla/webtools/bugzilla/Bugzilla/User/Setting/Skin.pm b/mozilla/webtools/bugzilla/Bugzilla/User/Setting/Skin.pm
index 3181fdded16..1e4e95a03e3 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/User/Setting/Skin.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/User/Setting/Skin.pm
@@ -11,7 +11,7 @@ package Bugzilla::User::Setting::Skin;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::User::Setting);
+use parent qw(Bugzilla::User::Setting);
 
 use Bugzilla::Constants;
 use File::Spec::Functions;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/User/Setting/Timezone.pm b/mozilla/webtools/bugzilla/Bugzilla/User/Setting/Timezone.pm
index 962e0a7ff09..848fa418f8b 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/User/Setting/Timezone.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/User/Setting/Timezone.pm
@@ -12,7 +12,7 @@ use strict;
 
 use DateTime::TimeZone;
 
-use base qw(Bugzilla::User::Setting);
+use parent qw(Bugzilla::User::Setting);
 
 use Bugzilla::Constants;
 
diff --git a/mozilla/webtools/bugzilla/Bugzilla/UserAgent.pm b/mozilla/webtools/bugzilla/Bugzilla/UserAgent.pm
index 627120efc07..c3f38cf85be 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/UserAgent.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/UserAgent.pm
@@ -10,7 +10,7 @@ package Bugzilla::UserAgent;
 use 5.10.1;
 use strict;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 our @EXPORT = qw(detect_platform detect_op_sys);
 
 use Bugzilla::Field;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Util.pm b/mozilla/webtools/bugzilla/Bugzilla/Util.pm
index c7f75f07e54..bf072e88d51 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Util.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Util.pm
@@ -10,7 +10,7 @@ package Bugzilla::Util;
 use 5.10.1;
 use strict;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 @Bugzilla::Util::EXPORT = qw(trick_taint detaint_natural detaint_signed
                              html_quote url_quote xml_quote
                              css_class_quote html_light_quote
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Version.pm b/mozilla/webtools/bugzilla/Bugzilla/Version.pm
index b088e1c5c86..920853ecdb1 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Version.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Version.pm
@@ -10,7 +10,7 @@ package Bugzilla::Version;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Object);
+use parent qw(Bugzilla::Object);
 
 use Bugzilla::Install::Util qw(vers_cmp);
 use Bugzilla::Util;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/WebService/Bug.pm b/mozilla/webtools/bugzilla/Bugzilla/WebService/Bug.pm
index 6e352568af3..a7f8446ec39 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/WebService/Bug.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/WebService/Bug.pm
@@ -10,7 +10,7 @@ package Bugzilla::WebService::Bug;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::WebService);
+use parent qw(Bugzilla::WebService);
 
 use Bugzilla::Comment;
 use Bugzilla::Constants;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/WebService/Bugzilla.pm b/mozilla/webtools/bugzilla/Bugzilla/WebService/Bugzilla.pm
index d220d3c733c..6fd7a023ae5 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/WebService/Bugzilla.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/WebService/Bugzilla.pm
@@ -10,7 +10,7 @@ package Bugzilla::WebService::Bugzilla;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::WebService);
+use parent qw(Bugzilla::WebService);
 use Bugzilla::Constants;
 use Bugzilla::Util qw(datetime_from);
 use Bugzilla::WebService::Util qw(validate filter_wants);
diff --git a/mozilla/webtools/bugzilla/Bugzilla/WebService/Classification.pm b/mozilla/webtools/bugzilla/Bugzilla/WebService/Classification.pm
index a3344b1c58c..c104994a545 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/WebService/Classification.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/WebService/Classification.pm
@@ -10,7 +10,7 @@ package Bugzilla::WebService::Classification;
 use 5.10.1;
 use strict;
 
-use base qw (Bugzilla::WebService);
+use parent qw (Bugzilla::WebService);
 
 use Bugzilla::Classification;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/WebService/Constants.pm b/mozilla/webtools/bugzilla/Bugzilla/WebService/Constants.pm
index 126cd7947e8..624ab6e0920 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/WebService/Constants.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/WebService/Constants.pm
@@ -10,7 +10,7 @@ package Bugzilla::WebService::Constants;
 use 5.10.1;
 use strict;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 
 our @EXPORT = qw(
     WS_ERROR_CODE
diff --git a/mozilla/webtools/bugzilla/Bugzilla/WebService/Group.pm b/mozilla/webtools/bugzilla/Bugzilla/WebService/Group.pm
index 79ce1658b07..e9aa405f6a2 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/WebService/Group.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/WebService/Group.pm
@@ -10,7 +10,7 @@ package Bugzilla::WebService::Group;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::WebService);
+use parent qw(Bugzilla::WebService);
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::WebService::Util qw(validate translate params_to_objects);
diff --git a/mozilla/webtools/bugzilla/Bugzilla/WebService/Product.pm b/mozilla/webtools/bugzilla/Bugzilla/WebService/Product.pm
index 30a97c4653c..fc48ecd88d2 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/WebService/Product.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/WebService/Product.pm
@@ -10,7 +10,7 @@ package Bugzilla::WebService::Product;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::WebService);
+use parent qw(Bugzilla::WebService);
 use Bugzilla::Product;
 use Bugzilla::User;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/WebService/README b/mozilla/webtools/bugzilla/Bugzilla/WebService/README
index bbe32097901..eb4799cfcf3 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/WebService/README
+++ b/mozilla/webtools/bugzilla/Bugzilla/WebService/README
@@ -11,7 +11,7 @@ When XMLRPC::Lite calls a method, $self is the name of the *class* the
 method is in. For example, if we call Bugzilla.version(), the first argument
 is Bugzilla::WebService::Bugzilla. So in order to have $self
 (our first argument) act correctly in XML-RPC, we make all WebService
-classes use base qw(Bugzilla::WebService). 
+classes use parent qw(Bugzilla::WebService). 
 
 When JSON::RPC calls a method, $self is the JSON-RPC *server object*. In other
 words, it's an instance of Bugzilla::WebService::Server::JSONRPC. So we have
diff --git a/mozilla/webtools/bugzilla/Bugzilla/WebService/Server/XMLRPC.pm b/mozilla/webtools/bugzilla/Bugzilla/WebService/Server/XMLRPC.pm
index f55bd6cf24d..b4af1ab94c2 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/WebService/Server/XMLRPC.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/WebService/Server/XMLRPC.pm
@@ -79,7 +79,7 @@ package Bugzilla::XMLRPC::Deserializer;
 use 5.10.1;
 use strict;
 
-# We can't use "use base" because XMLRPC::Serializer doesn't return
+# We can't use "use parent" because XMLRPC::Serializer doesn't return
 # a true value.
 use XMLRPC::Lite;
 our @ISA = qw(XMLRPC::Deserializer);
@@ -204,7 +204,7 @@ use 5.10.1;
 use strict;
 
 use Scalar::Util qw(blessed);
-# We can't use "use base" because XMLRPC::Serializer doesn't return
+# We can't use "use parent" because XMLRPC::Serializer doesn't return
 # a true value.
 use XMLRPC::Lite;
 our @ISA = qw(XMLRPC::Serializer);
diff --git a/mozilla/webtools/bugzilla/Bugzilla/WebService/User.pm b/mozilla/webtools/bugzilla/Bugzilla/WebService/User.pm
index 527ca95a378..b8a3763a2bd 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/WebService/User.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/WebService/User.pm
@@ -10,7 +10,7 @@ package Bugzilla::WebService::User;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::WebService);
+use parent qw(Bugzilla::WebService);
 
 use Bugzilla::Constants;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/WebService/Util.pm b/mozilla/webtools/bugzilla/Bugzilla/WebService/Util.pm
index 57a55a5991b..9e20a1e0685 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/WebService/Util.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/WebService/Util.pm
@@ -10,7 +10,7 @@ package Bugzilla::WebService::Util;
 use 5.10.1;
 use strict;
 
-use base qw(Exporter);
+use parent qw(Exporter);
 
 # We have to "require", not "use" this, because otherwise it tries to
 # use features of Test::More during import().
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Whine.pm b/mozilla/webtools/bugzilla/Bugzilla/Whine.pm
index fba6e714ab0..488127dfa9d 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Whine.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Whine.pm
@@ -10,7 +10,7 @@ package Bugzilla::Whine;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Object);
+use parent qw(Bugzilla::Object);
 
 use Bugzilla::Constants;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Whine/Query.pm b/mozilla/webtools/bugzilla/Bugzilla/Whine/Query.pm
index b40ba1c3b09..a4fd54539a5 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Whine/Query.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Whine/Query.pm
@@ -10,7 +10,7 @@ package Bugzilla::Whine::Query;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Object);
+use parent qw(Bugzilla::Object);
 
 use Bugzilla::Constants;
 use Bugzilla::Search::Saved;
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Whine/Schedule.pm b/mozilla/webtools/bugzilla/Bugzilla/Whine/Schedule.pm
index 2171f84a58a..f16c629af48 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Whine/Schedule.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Whine/Schedule.pm
@@ -10,7 +10,7 @@ package Bugzilla::Whine::Schedule;
 use 5.10.1;
 use strict;
 
-use base qw(Bugzilla::Object);
+use parent qw(Bugzilla::Object);
 
 use Bugzilla::Constants;
 
diff --git a/mozilla/webtools/bugzilla/contrib/extension-convert.pl b/mozilla/webtools/bugzilla/contrib/extension-convert.pl
index 457f40f0748..4e24b614ac8 100644
--- a/mozilla/webtools/bugzilla/contrib/extension-convert.pl
+++ b/mozilla/webtools/bugzilla/contrib/extension-convert.pl
@@ -76,7 +76,7 @@ END
 my $extension_pm = <<END;
 package Bugzilla::Extension::$extension_name;
 use strict;
-use base qw(Bugzilla::Extension);
+use parent qw(Bugzilla::Extension);
 
 $modules
 
diff --git a/mozilla/webtools/bugzilla/docs/lib/Pod/Simple/HTML/Bugzilla.pm b/mozilla/webtools/bugzilla/docs/lib/Pod/Simple/HTML/Bugzilla.pm
index 4a15176711e..66e1d7b59bc 100644
--- a/mozilla/webtools/bugzilla/docs/lib/Pod/Simple/HTML/Bugzilla.pm
+++ b/mozilla/webtools/bugzilla/docs/lib/Pod/Simple/HTML/Bugzilla.pm
@@ -10,7 +10,7 @@ package Pod::Simple::HTML::Bugzilla;
 use 5.10.1;
 use strict;
 
-use base qw(Pod::Simple::HTML);
+use parent qw(Pod::Simple::HTML);
 
 # Without this constant, HTMLBatch will throw undef warnings.
 use constant VERSION    => $Pod::Simple::HTML::VERSION;
diff --git a/mozilla/webtools/bugzilla/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm b/mozilla/webtools/bugzilla/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm
index 52a09910fab..bc60d0374ad 100644
--- a/mozilla/webtools/bugzilla/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm
+++ b/mozilla/webtools/bugzilla/docs/lib/Pod/Simple/HTMLBatch/Bugzilla.pm
@@ -10,7 +10,7 @@ package Pod::Simple::HTMLBatch::Bugzilla;
 use 5.10.1;
 use strict;
 
-use base qw(Pod::Simple::HTMLBatch);
+use parent qw(Pod::Simple::HTMLBatch);
 
 # This is the same hack that HTMLBatch does to "import" this subroutine.
 BEGIN { *esc = \&Pod::Simple::HTML::esc }
diff --git a/mozilla/webtools/bugzilla/extensions/BmpConvert/Extension.pm b/mozilla/webtools/bugzilla/extensions/BmpConvert/Extension.pm
index 87ec5f5fd73..b30bab60489 100644
--- a/mozilla/webtools/bugzilla/extensions/BmpConvert/Extension.pm
+++ b/mozilla/webtools/bugzilla/extensions/BmpConvert/Extension.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::BmpConvert;
 use strict;
-use base qw(Bugzilla::Extension);
+use parent qw(Bugzilla::Extension);
 
 use Image::Magick;
 
diff --git a/mozilla/webtools/bugzilla/extensions/Example/Extension.pm b/mozilla/webtools/bugzilla/extensions/Example/Extension.pm
index b3b1b299f86..6b85ace42c1 100644
--- a/mozilla/webtools/bugzilla/extensions/Example/Extension.pm
+++ b/mozilla/webtools/bugzilla/extensions/Example/Extension.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::Example;
 use strict;
-use base qw(Bugzilla::Extension);
+use parent qw(Bugzilla::Extension);
 
 use Bugzilla::Constants;
 use Bugzilla::Error;
diff --git a/mozilla/webtools/bugzilla/extensions/Example/lib/Auth/Login.pm b/mozilla/webtools/bugzilla/extensions/Example/lib/Auth/Login.pm
index f878311574d..03ca2481d26 100644
--- a/mozilla/webtools/bugzilla/extensions/Example/lib/Auth/Login.pm
+++ b/mozilla/webtools/bugzilla/extensions/Example/lib/Auth/Login.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::Example::Auth::Login;
 use strict;
-use base qw(Bugzilla::Auth::Login);
+use parent qw(Bugzilla::Auth::Login);
 use constant user_can_create_account => 0;
 use Bugzilla::Constants;
 
diff --git a/mozilla/webtools/bugzilla/extensions/Example/lib/Auth/Verify.pm b/mozilla/webtools/bugzilla/extensions/Example/lib/Auth/Verify.pm
index 0d068b2e1e5..0a0b4023228 100644
--- a/mozilla/webtools/bugzilla/extensions/Example/lib/Auth/Verify.pm
+++ b/mozilla/webtools/bugzilla/extensions/Example/lib/Auth/Verify.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::Example::Auth::Verify;
 use strict;
-use base qw(Bugzilla::Auth::Verify);
+use parent qw(Bugzilla::Auth::Verify);
 use Bugzilla::Constants;
 
 # A verifier that always fails.
diff --git a/mozilla/webtools/bugzilla/extensions/Example/lib/WebService.pm b/mozilla/webtools/bugzilla/extensions/Example/lib/WebService.pm
index 659189d2f9f..e5e14af53aa 100644
--- a/mozilla/webtools/bugzilla/extensions/Example/lib/WebService.pm
+++ b/mozilla/webtools/bugzilla/extensions/Example/lib/WebService.pm
@@ -8,7 +8,7 @@
 package Bugzilla::Extension::Example::WebService;
 use strict;
 use warnings;
-use base qw(Bugzilla::WebService);
+use parent qw(Bugzilla::WebService);
 use Bugzilla::Error;
 
 # This can be called as Example.hello() from the WebService.
diff --git a/mozilla/webtools/bugzilla/extensions/MoreBugUrl/Extension.pm b/mozilla/webtools/bugzilla/extensions/MoreBugUrl/Extension.pm
index 52b6e61c376..b251e70a802 100644
--- a/mozilla/webtools/bugzilla/extensions/MoreBugUrl/Extension.pm
+++ b/mozilla/webtools/bugzilla/extensions/MoreBugUrl/Extension.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::MoreBugUrl;
 use strict;
-use base qw(Bugzilla::Extension);
+use parent qw(Bugzilla::Extension);
 
 use constant MORE_SUB_CLASSES => qw(
     Bugzilla::Extension::MoreBugUrl::ReviewBoard
diff --git a/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/GetSatisfaction.pm b/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/GetSatisfaction.pm
index ff63b10e1a2..5adb897bce6 100644
--- a/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/GetSatisfaction.pm
+++ b/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/GetSatisfaction.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::MoreBugUrl::GetSatisfaction;
 use strict;
-use base qw(Bugzilla::BugUrl);
+use parent qw(Bugzilla::BugUrl);
 
 ###############################
 ####        Methods        ####
diff --git a/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/PHP.pm b/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/PHP.pm
index c8d4e1689e4..38795b5e664 100644
--- a/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/PHP.pm
+++ b/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/PHP.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::MoreBugUrl::PHP;
 use strict;
-use base qw(Bugzilla::BugUrl);
+use parent qw(Bugzilla::BugUrl);
 
 ###############################
 ####        Methods        ####
diff --git a/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/RT.pm b/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/RT.pm
index 0d5faa2a88a..1321180897e 100644
--- a/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/RT.pm
+++ b/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/RT.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::MoreBugUrl::RT;
 use strict;
-use base qw(Bugzilla::BugUrl);
+use parent qw(Bugzilla::BugUrl);
 
 ###############################
 ####        Methods        ####
diff --git a/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/ReviewBoard.pm b/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/ReviewBoard.pm
index 7628dd31418..0c4d83fab01 100644
--- a/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/ReviewBoard.pm
+++ b/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/ReviewBoard.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::MoreBugUrl::ReviewBoard;
 use strict;
-use base qw(Bugzilla::BugUrl);
+use parent qw(Bugzilla::BugUrl);
 
 ###############################
 ####        Methods        ####
diff --git a/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/Rietveld.pm b/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/Rietveld.pm
index 0c52892e242..f9e8940324e 100644
--- a/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/Rietveld.pm
+++ b/mozilla/webtools/bugzilla/extensions/MoreBugUrl/lib/Rietveld.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::MoreBugUrl::Rietveld;
 use strict;
-use base qw(Bugzilla::BugUrl);
+use parent qw(Bugzilla::BugUrl);
 
 ###############################
 ####        Methods        ####
diff --git a/mozilla/webtools/bugzilla/extensions/OldBugMove/Extension.pm b/mozilla/webtools/bugzilla/extensions/OldBugMove/Extension.pm
index 9a499d5d048..913553790c0 100644
--- a/mozilla/webtools/bugzilla/extensions/OldBugMove/Extension.pm
+++ b/mozilla/webtools/bugzilla/extensions/OldBugMove/Extension.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::OldBugMove;
 use strict;
-use base qw(Bugzilla::Extension);
+use parent qw(Bugzilla::Extension);
 use Bugzilla::Constants;
 use Bugzilla::Error;
 use Bugzilla::Field::Choice;
diff --git a/mozilla/webtools/bugzilla/extensions/Voting/Extension.pm b/mozilla/webtools/bugzilla/extensions/Voting/Extension.pm
index 49ab99e13b1..03397eaf465 100644
--- a/mozilla/webtools/bugzilla/extensions/Voting/Extension.pm
+++ b/mozilla/webtools/bugzilla/extensions/Voting/Extension.pm
@@ -7,7 +7,7 @@
 
 package Bugzilla::Extension::Voting;
 use strict;
-use base qw(Bugzilla::Extension);
+use parent qw(Bugzilla::Extension);
 
 use Bugzilla::Bug;
 use Bugzilla::BugMail;
diff --git a/mozilla/webtools/bugzilla/mod_perl.pl b/mozilla/webtools/bugzilla/mod_perl.pl
index 20d8e50605a..20b9746f39e 100755
--- a/mozilla/webtools/bugzilla/mod_perl.pl
+++ b/mozilla/webtools/bugzilla/mod_perl.pl
@@ -113,7 +113,7 @@ package Bugzilla::ModPerl::ResponseHandler;
 use 5.10.1;
 use strict;
 
-use base qw(ModPerl::Registry);
+use parent qw(ModPerl::Registry);
 use Bugzilla;
 
 sub handler : method {
diff --git a/mozilla/webtools/bugzilla/t/010dependencies.t b/mozilla/webtools/bugzilla/t/010dependencies.t
index d84688a7ed7..89a26ba5efa 100644
--- a/mozilla/webtools/bugzilla/t/010dependencies.t
+++ b/mozilla/webtools/bugzilla/t/010dependencies.t
@@ -27,7 +27,7 @@ use constant MODULE_REGEX => qr/
     ['"]?
     ([\w:\.\\]+)
 /x;
-use constant BASE_REGEX => qr/^use base qw\(([^\)]+)/;
+use constant BASE_REGEX => qr/^use (?:base|parent) (?:-norequire, )?qw\(([^\)]+)/;
 
 # Extract all Perl modules.
 foreach my $file (@Support::Files::testitems) {
@@ -59,7 +59,7 @@ foreach my $module (keys %mods) {
       }
       elsif ($line =~ BASE_REGEX or $line =~ MODULE_REGEX) {
         my $used_string = $1;
-        # "use base" can have multiple modules
+        # "use base"/"use parent" can have multiple modules
         my @used_array = split(/\s+/, $used_string);
         foreach my $used (@used_array) {
             next if $used !~ /^Bugzilla/;
diff --git a/mozilla/webtools/bugzilla/t/Support/Templates.pm b/mozilla/webtools/bugzilla/t/Support/Templates.pm
index a28ec8759ac..c9a528e9f90 100644
--- a/mozilla/webtools/bugzilla/t/Support/Templates.pm
+++ b/mozilla/webtools/bugzilla/t/Support/Templates.pm
@@ -10,7 +10,7 @@ package Support::Templates;
 use strict;
 
 use lib 't';
-use base qw(Exporter);
+use parent qw(Exporter);
 @Support::Templates::EXPORT = 
          qw(@languages @include_paths $english_default_include_path
          %include_path @referenced_files %actual_files $num_actual_files);
diff --git a/mozilla/webtools/bugzilla/template/en/default/extensions/extension.pm.tmpl b/mozilla/webtools/bugzilla/template/en/default/extensions/extension.pm.tmpl
index 206ea88f4e6..993bceb18b5 100644
--- a/mozilla/webtools/bugzilla/template/en/default/extensions/extension.pm.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/extensions/extension.pm.tmpl
@@ -14,7 +14,7 @@
 
 package B[% %]ugzilla::Extension::[% name %];
 use strict;
-use base qw(B[% %]ugzilla::Extension);
+use parent qw(B[% %]ugzilla::Extension);
 
 # This code for this is in [% path %]/lib/Util.pm
 use B[% %]ugzilla::Extension::[% name %]::Util;
diff --git a/mozilla/webtools/bugzilla/template/en/default/extensions/util.pm.tmpl b/mozilla/webtools/bugzilla/template/en/default/extensions/util.pm.tmpl
index 6c9fe379580..c693c8a01c6 100644
--- a/mozilla/webtools/bugzilla/template/en/default/extensions/util.pm.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/extensions/util.pm.tmpl
@@ -14,7 +14,7 @@
 
 package B[% %]ugzilla::Extension::[% name %]::Util;
 use strict;
-use base qw(Exporter);
+use parent qw(Exporter);
 our @EXPORT = qw(
     
 );
diff --git a/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/AndTest.pm b/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/AndTest.pm
index ac417121ecd..f34ba1f3afb 100644
--- a/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/AndTest.pm
+++ b/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/AndTest.pm
@@ -8,7 +8,7 @@
 # This test combines two field/operator combinations using AND in
 # a single boolean chart.
 package Bugzilla::Test::Search::AndTest;
-use base qw(Bugzilla::Test::Search::OrTest);
+use parent qw(Bugzilla::Test::Search::OrTest);
 
 use Bugzilla::Test::Search::Constants;
 use List::MoreUtils qw(all);
diff --git a/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/Constants.pm b/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/Constants.pm
index bfcc439e403..53837ba581f 100644
--- a/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/Constants.pm
+++ b/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/Constants.pm
@@ -12,7 +12,7 @@
 # More detailed information on each constant is available in the comments
 # in this file.
 package Bugzilla::Test::Search::Constants;
-use base qw(Exporter);
+use parent qw(Exporter);
 use Bugzilla::Constants;
 use Bugzilla::Util qw(generate_random_password);
 
diff --git a/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/CustomTest.pm b/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/CustomTest.pm
index 15e302cf3fd..132e5ac4077 100644
--- a/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/CustomTest.pm
+++ b/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/CustomTest.pm
@@ -9,7 +9,7 @@
 # Tests like this are specified in CUSTOM_SEARCH_TESTS in
 # Bugzilla::Test::Search::Constants.
 package Bugzilla::Test::Search::CustomTest;
-use base qw(Bugzilla::Test::Search::FieldTest);
+use parent qw(Bugzilla::Test::Search::FieldTest);
 use strict;
 use warnings;
 
diff --git a/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm b/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm
index 4147c249e28..888e7eb13fa 100644
--- a/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm
+++ b/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/FieldTestNormal.pm
@@ -10,7 +10,7 @@
 package Bugzilla::Test::Search::FieldTestNormal;
 use strict;
 use warnings;
-use base qw(Bugzilla::Test::Search::FieldTest);
+use parent qw(Bugzilla::Test::Search::FieldTest);
 
 use Scalar::Util qw(blessed);
 
diff --git a/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/InjectionTest.pm b/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/InjectionTest.pm
index 86dff3e0fc8..90eaabc7870 100644
--- a/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/InjectionTest.pm
+++ b/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/InjectionTest.pm
@@ -8,7 +8,7 @@
 # This module represents the SQL Injection tests that get run on a single
 # operator/field combination for Bugzilla::Test::Search.
 package Bugzilla::Test::Search::InjectionTest;
-use base qw(Bugzilla::Test::Search::FieldTest);
+use parent qw(Bugzilla::Test::Search::FieldTest);
 
 use strict;
 use warnings;
diff --git a/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/NotTest.pm b/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/NotTest.pm
index def4f9ac9b5..190b8567bb4 100644
--- a/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/NotTest.pm
+++ b/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/NotTest.pm
@@ -12,7 +12,7 @@
 # it to OrTest and AndTest, but without Moose there isn't much of an
 # easy way to do that.
 package Bugzilla::Test::Search::NotTest;
-use base qw(Bugzilla::Test::Search::FieldTest);
+use parent qw(Bugzilla::Test::Search::FieldTest);
 use strict;
 use warnings;
 use Bugzilla::Test::Search::Constants;
diff --git a/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/OrTest.pm b/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/OrTest.pm
index d460e442231..1b948f38ded 100644
--- a/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/OrTest.pm
+++ b/mozilla/webtools/bugzilla/xt/lib/Bugzilla/Test/Search/OrTest.pm
@@ -8,7 +8,7 @@
 # This test combines two field/operator combinations using OR in
 # a single boolean chart.
 package Bugzilla::Test::Search::OrTest;
-use base qw(Bugzilla::Test::Search::FieldTest);
+use parent qw(Bugzilla::Test::Search::FieldTest);
 
 use Bugzilla::Test::Search::Constants;
 use List::MoreUtils qw(all any uniq);