summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Attachment.pm1
-rwxr-xr-xBug.pm1
-rw-r--r--Bugzilla/Attachment.pm1
-rwxr-xr-xBugzilla/Bug.pm1
-rw-r--r--Bugzilla/RelationSet.pm1
-rw-r--r--Bugzilla/Search.pm1
-rw-r--r--Bugzilla/Token.pm1
-rw-r--r--Bugzilla/Util.pm1
-rw-r--r--CGI.pl1
-rw-r--r--RelationSet.pm1
-rw-r--r--Token.pm1
-rwxr-xr-xattachment.cgi1
-rw-r--r--bug_form.pl1
-rwxr-xr-xbuglist.cgi1
-rwxr-xr-xchecksetup.pl1
-rwxr-xr-xcolchange.cgi1
-rwxr-xr-xcollectstats.pl1
-rw-r--r--contrib/BugzillaEmail.pm1
-rwxr-xr-xcontrib/bug_email.pl3
-rwxr-xr-xcontrib/bugzilla_email_append.pl1
-rwxr-xr-xcontrib/mysqld-watcher.pl1
-rwxr-xr-xcreateaccount.cgi1
-rw-r--r--defparams.pl1
-rwxr-xr-xdescribecomponents.cgi1
-rwxr-xr-xdescribekeywords.cgi1
-rwxr-xr-xdoeditparams.cgi1
-rwxr-xr-xduplicates.cgi1
-rwxr-xr-xeditattachstatuses.cgi1
-rwxr-xr-xeditcomponents.cgi1
-rwxr-xr-xeditgroups.cgi1
-rwxr-xr-xeditkeywords.cgi1
-rwxr-xr-xeditmilestones.cgi1
-rwxr-xr-xeditparams.cgi1
-rwxr-xr-xeditproducts.cgi1
-rwxr-xr-xeditusers.cgi1
-rwxr-xr-xeditversions.cgi1
-rwxr-xr-xenter_bug.cgi1
-rw-r--r--globals.pl1
-rwxr-xr-ximportxml.pl1
-rwxr-xr-xindex.cgi1
-rwxr-xr-xlong_list.cgi1
-rwxr-xr-xmove.pl1
-rwxr-xr-xpage.cgi1
-rwxr-xr-xpost_bug.cgi1
-rwxr-xr-xprocess_bug.cgi1
-rwxr-xr-xprocessmail1
-rwxr-xr-xquery.cgi1
-rwxr-xr-xqueryhelp.cgi1
-rwxr-xr-xquips.cgi1
-rwxr-xr-xrelogin.cgi1
-rwxr-xr-xreports.cgi1
-rwxr-xr-xsanitycheck.cgi1
-rwxr-xr-xshow_activity.cgi1
-rwxr-xr-xshow_bug.cgi1
-rwxr-xr-xshowattachment.cgi1
-rwxr-xr-xshowdependencygraph.cgi1
-rwxr-xr-xshowdependencytree.cgi1
-rwxr-xr-xsidebar.cgi1
-rwxr-xr-xsyncshadowdb1
-rw-r--r--t/Support/Templates.pm1
-rwxr-xr-xtoken.cgi1
-rwxr-xr-xuserprefs.cgi1
-rwxr-xr-xvotes.cgi1
-rwxr-xr-xwhineatnews.pl1
-rwxr-xr-xxml.cgi1
65 files changed, 1 insertions, 66 deletions
diff --git a/Attachment.pm b/Attachment.pm
index b4216d4c6..3a6248cf4 100644
--- a/Attachment.pm
+++ b/Attachment.pm
@@ -24,7 +24,6 @@
# Module Initialization
############################################################################
-use diagnostics;
use strict;
package Attachment;
diff --git a/Bug.pm b/Bug.pm
index 51b51cec9..7857cb924 100755
--- a/Bug.pm
+++ b/Bug.pm
@@ -21,7 +21,6 @@
# Terry Weissman <terry@mozilla.org>
# Chris Yeh <cyeh@bluemartini.com>
-use diagnostics;
use strict;
use DBI;
diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index b4216d4c6..3a6248cf4 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -24,7 +24,6 @@
# Module Initialization
############################################################################
-use diagnostics;
use strict;
package Attachment;
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 51b51cec9..7857cb924 100755
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -21,7 +21,6 @@
# Terry Weissman <terry@mozilla.org>
# Chris Yeh <cyeh@bluemartini.com>
-use diagnostics;
use strict;
use DBI;
diff --git a/Bugzilla/RelationSet.pm b/Bugzilla/RelationSet.pm
index 8668519b9..a3af4b60a 100644
--- a/Bugzilla/RelationSet.pm
+++ b/Bugzilla/RelationSet.pm
@@ -29,7 +29,6 @@
# might involve turning this into a virtual base class, and having
# UserSet and KeywordSet types that inherit from it.
-use diagnostics;
use strict;
# Everything that uses RelationSet should already have globals.pl loaded
diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm
index 562a68e48..b8cc9fed8 100644
--- a/Bugzilla/Search.pm
+++ b/Bugzilla/Search.pm
@@ -25,7 +25,6 @@
# Myk Melez <myk@mozilla.org>
# Michael Schindler <michael@compressconsult.com>
-use diagnostics;
use strict;
require "globals.pl";
diff --git a/Bugzilla/Token.pm b/Bugzilla/Token.pm
index 78eef9335..6d0741133 100644
--- a/Bugzilla/Token.pm
+++ b/Bugzilla/Token.pm
@@ -24,7 +24,6 @@
################################################################################
# Make it harder for us to do dangerous things in Perl.
-use diagnostics;
use strict;
# Bundle the functions in this file together into the "Token" package.
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 74e7c1fe6..3fe3a37ea 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -69,7 +69,6 @@ use base qw(Exporter);
trim);
use strict;
-use diagnostics;
=head1 FUNCTIONS
diff --git a/CGI.pl b/CGI.pl
index b2316d555..69819263a 100644
--- a/CGI.pl
+++ b/CGI.pl
@@ -27,7 +27,6 @@
# Contains some global routines used throughout the CGI scripts of Bugzilla.
-use diagnostics;
use strict;
use lib ".";
diff --git a/RelationSet.pm b/RelationSet.pm
index 8668519b9..a3af4b60a 100644
--- a/RelationSet.pm
+++ b/RelationSet.pm
@@ -29,7 +29,6 @@
# might involve turning this into a virtual base class, and having
# UserSet and KeywordSet types that inherit from it.
-use diagnostics;
use strict;
# Everything that uses RelationSet should already have globals.pl loaded
diff --git a/Token.pm b/Token.pm
index 78eef9335..6d0741133 100644
--- a/Token.pm
+++ b/Token.pm
@@ -24,7 +24,6 @@
################################################################################
# Make it harder for us to do dangerous things in Perl.
-use diagnostics;
use strict;
# Bundle the functions in this file together into the "Token" package.
diff --git a/attachment.cgi b/attachment.cgi
index a94ebc835..43b2b4940 100755
--- a/attachment.cgi
+++ b/attachment.cgi
@@ -26,7 +26,6 @@
################################################################################
# Make it harder for us to do dangerous things in Perl.
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/bug_form.pl b/bug_form.pl
index c4d623e12..e6b59e051 100644
--- a/bug_form.pl
+++ b/bug_form.pl
@@ -21,7 +21,6 @@
# Dave Miller <justdave@syndicomm.com>
# Vaskin Kissoyan <vkissoyan@yahoo.com>
-use diagnostics;
use strict;
use RelationSet;
diff --git a/buglist.cgi b/buglist.cgi
index cf25811da..c5359c6e3 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -29,7 +29,6 @@
################################################################################
# Make it harder for us to do dangerous things in Perl.
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/checksetup.pl b/checksetup.pl
index 7ff6abada..8bba2996b 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -94,7 +94,6 @@
# Global definitions
###########################################################################
-use diagnostics;
use strict;
# 12/17/00 justdave@syndicomm.com - removed declarations of the localconfig
diff --git a/colchange.cgi b/colchange.cgi
index 4b1cfc819..2ef7c7d10 100755
--- a/colchange.cgi
+++ b/colchange.cgi
@@ -21,7 +21,6 @@
# Contributor(s): Terry Weissman <terry@mozilla.org>
# Gervase Markham <gerv@gerv.net>
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/collectstats.pl b/collectstats.pl
index a47e2174d..8caf92d77 100755
--- a/collectstats.pl
+++ b/collectstats.pl
@@ -26,7 +26,6 @@
use AnyDBM_File;
-use diagnostics;
use strict;
use vars @::legal_product;
diff --git a/contrib/BugzillaEmail.pm b/contrib/BugzillaEmail.pm
index aaba0f4e0..48602cdb7 100644
--- a/contrib/BugzillaEmail.pm
+++ b/contrib/BugzillaEmail.pm
@@ -29,7 +29,6 @@ push @INC, "../."; # this script now lives in contrib
require "globals.pl";
-use diagnostics;
use strict;
my $EMAIL_TRANSFORM_NONE = "email_transform_none";
diff --git a/contrib/bug_email.pl b/contrib/bug_email.pl
index 94338dbfb..fb2bbec4d 100755
--- a/contrib/bug_email.pl
+++ b/contrib/bug_email.pl
@@ -37,7 +37,7 @@
#
# You need to work with bug_email.pl the MIME::Parser installed.
#
-# $Id: bug_email.pl,v 1.12 2002/08/17 14:19:57 bbaetz%student.usyd.edu.au Exp $
+# $Id: bug_email.pl,v 1.13 2002/08/26 06:17:21 bbaetz%student.usyd.edu.au Exp $
###############################################################
# 02/12/2000 (SML)
@@ -66,7 +66,6 @@
# - integrate some setup in the checksetup.pl script
# - gpg signatures for security
-use diagnostics;
use strict;
use MIME::Parser;
diff --git a/contrib/bugzilla_email_append.pl b/contrib/bugzilla_email_append.pl
index 826b49198..7e1de847b 100755
--- a/contrib/bugzilla_email_append.pl
+++ b/contrib/bugzilla_email_append.pl
@@ -28,7 +28,6 @@
# 1. better way to get the body text (I don't know what dump_entity() is
# actually doing
-use diagnostics;
use strict;
use MIME::Parser;
diff --git a/contrib/mysqld-watcher.pl b/contrib/mysqld-watcher.pl
index ccc1f3878..30945a5ff 100755
--- a/contrib/mysqld-watcher.pl
+++ b/contrib/mysqld-watcher.pl
@@ -23,7 +23,6 @@
# mysqld-watcher.pl - a script that watches the running instance of
# mysqld and kills off any long-running SELECTs against the shadow_db
#
-use diagnostics;
use strict;
# some configurables:
diff --git a/createaccount.cgi b/createaccount.cgi
index 8a5b85782..79be1bb64 100755
--- a/createaccount.cgi
+++ b/createaccount.cgi
@@ -24,7 +24,6 @@
# Christopher Aillon <christopher@aillon.com>
# Gervase Markham <gerv@gerv.net>
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/defparams.pl b/defparams.pl
index 4f30f85a9..67870893d 100644
--- a/defparams.pl
+++ b/defparams.pl
@@ -33,7 +33,6 @@
# Only adding new parameters is done here. Once the parameter exists, you
# must use %baseurl%/editparams.cgi from the web to edit the settings.
-use diagnostics;
use strict;
# Shut up misguided -w warnings about "used only once". For some reason,
diff --git a/describecomponents.cgi b/describecomponents.cgi
index edf9349ab..9edb5dfa0 100755
--- a/describecomponents.cgi
+++ b/describecomponents.cgi
@@ -27,7 +27,6 @@ use vars qw(
$userid
);
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/describekeywords.cgi b/describekeywords.cgi
index 503e0d5a3..07f08d09b 100755
--- a/describekeywords.cgi
+++ b/describekeywords.cgi
@@ -21,7 +21,6 @@
# Contributor(s): Terry Weissman <terry@mozilla.org>
# Contributor(s): Gervase Markham <gerv@gerv.net>
-use diagnostics;
use strict;
use lib ".";
diff --git a/doeditparams.cgi b/doeditparams.cgi
index c237a1997..b7c834979 100755
--- a/doeditparams.cgi
+++ b/doeditparams.cgi
@@ -21,7 +21,6 @@
# Contributor(s): Terry Weissman <terry@mozilla.org>
# J. Paul Reed <preed@sigkill.com>
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/duplicates.cgi b/duplicates.cgi
index 2d46e0d79..285c65717 100755
--- a/duplicates.cgi
+++ b/duplicates.cgi
@@ -23,7 +23,6 @@
# Generates mostfreq list from data collected by collectstats.pl.
-use diagnostics;
use strict;
use AnyDBM_File;
diff --git a/editattachstatuses.cgi b/editattachstatuses.cgi
index ff7822181..eedf2add4 100755
--- a/editattachstatuses.cgi
+++ b/editattachstatuses.cgi
@@ -26,7 +26,6 @@
################################################################################
# Make it harder for us to do dangerous things in Perl.
-use diagnostics;
use strict;
use lib ".";
diff --git a/editcomponents.cgi b/editcomponents.cgi
index 3f1619739..7ad81ddfa 100755
--- a/editcomponents.cgi
+++ b/editcomponents.cgi
@@ -25,7 +25,6 @@
#
# Holger Schurig <holgerschurig@nikocity.de>
-use diagnostics;
use strict;
use lib ".";
diff --git a/editgroups.cgi b/editgroups.cgi
index 623cf47d3..cd1805792 100755
--- a/editgroups.cgi
+++ b/editgroups.cgi
@@ -23,7 +23,6 @@
# Code derived from editowners.cgi and editusers.cgi
-use diagnostics;
use strict;
use lib ".";
diff --git a/editkeywords.cgi b/editkeywords.cgi
index 1b8d6ef30..ed298ef9b 100755
--- a/editkeywords.cgi
+++ b/editkeywords.cgi
@@ -20,7 +20,6 @@
#
# Contributor(s): Terry Weissman <terry@mozilla.org>
-use diagnostics;
use strict;
use lib ".";
diff --git a/editmilestones.cgi b/editmilestones.cgi
index 67d84fcce..c7d598bea 100755
--- a/editmilestones.cgi
+++ b/editmilestones.cgi
@@ -13,7 +13,6 @@
#
-use diagnostics;
use strict;
use lib ".";
diff --git a/editparams.cgi b/editparams.cgi
index 0e1b7161f..ef9e14946 100755
--- a/editparams.cgi
+++ b/editparams.cgi
@@ -22,7 +22,6 @@
# J. Paul Reed <preed@sigkill.com>
-use diagnostics;
use strict;
use lib ".";
diff --git a/editproducts.cgi b/editproducts.cgi
index 4b0698b35..520e46d50 100755
--- a/editproducts.cgi
+++ b/editproducts.cgi
@@ -27,7 +27,6 @@
#
# Holger Schurig <holgerschurig@nikocity.de>
-use diagnostics;
use strict;
use lib ".";
diff --git a/editusers.cgi b/editusers.cgi
index 0e25f0ac3..4586345af 100755
--- a/editusers.cgi
+++ b/editusers.cgi
@@ -27,7 +27,6 @@
#
# Holger Schurig <holgerschurig@nikocity.de>
-use diagnostics;
use strict;
use lib ".";
diff --git a/editversions.cgi b/editversions.cgi
index abeed2570..5f420af43 100755
--- a/editversions.cgi
+++ b/editversions.cgi
@@ -26,7 +26,6 @@
#
# Holger Schurig <holgerschurig@nikocity.de>
-use diagnostics;
use strict;
use lib ".";
diff --git a/enter_bug.cgi b/enter_bug.cgi
index 83f1126f9..7aa6dfc66 100755
--- a/enter_bug.cgi
+++ b/enter_bug.cgi
@@ -32,7 +32,6 @@
#
##############################################################################
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/globals.pl b/globals.pl
index b437d343f..164bad727 100644
--- a/globals.pl
+++ b/globals.pl
@@ -25,7 +25,6 @@
# Contains some global variables and routines used throughout bugzilla.
-use diagnostics;
use strict;
use Bugzilla::Util;
diff --git a/importxml.pl b/importxml.pl
index 092170c03..1777bfc4a 100755
--- a/importxml.pl
+++ b/importxml.pl
@@ -25,7 +25,6 @@
# a new bug into bugzilla. Everything before the beginning <?xml line
# is removed so you can pipe in email messages.
-use diagnostics;
use strict;
#####################################################################
diff --git a/index.cgi b/index.cgi
index d5ee0d28d..b07700f7e 100755
--- a/index.cgi
+++ b/index.cgi
@@ -30,7 +30,6 @@ use vars qw{ %COOKIE };
###############################################################################
# Make it harder for us to do dangerous things in Perl.
-use diagnostics;
use strict;
# Include the Bugzilla CGI and general utility library.
diff --git a/long_list.cgi b/long_list.cgi
index 933e90f15..eba094699 100755
--- a/long_list.cgi
+++ b/long_list.cgi
@@ -21,7 +21,6 @@
# Contributor(s): Terry Weissman <terry@mozilla.org>
# Gervase Markham <gerv@gerv.net>
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/move.pl b/move.pl
index 66a75f95f..65592b02f 100755
--- a/move.pl
+++ b/move.pl
@@ -21,7 +21,6 @@
# Contributor(s): Dawn Endico <endico@mozilla.org>
# Terry Weissman <terry@mozilla.org>
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/page.cgi b/page.cgi
index fb53f8b47..cc26f93db 100755
--- a/page.cgi
+++ b/page.cgi
@@ -28,7 +28,6 @@
# either case), numbers 0-9, the underscore "_" and the hyphen "-".
###############################################################################
-use diagnostics;
use strict;
use lib ".";
diff --git a/post_bug.cgi b/post_bug.cgi
index 55ee27301..bab55a9ac 100755
--- a/post_bug.cgi
+++ b/post_bug.cgi
@@ -23,7 +23,6 @@
# Joe Robins <jmrobins@tgix.com>
# Gervase Markham <gerv@gerv.net>
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/process_bug.cgi b/process_bug.cgi
index 653c365ce..a34616058 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -24,7 +24,6 @@
# Christopher Aillon <christopher@aillon.com>
# Myk Melez <myk@mozilla.org>
-use diagnostics;
use strict;
my $UserInEditGroupSet = -1;
diff --git a/processmail b/processmail
index 8d4dc4b69..5a1460c18 100755
--- a/processmail
+++ b/processmail
@@ -25,7 +25,6 @@
# Jacob Steenhagen <jake@actex.net>
# Matthew Tuck <matty@chariot.net.au>
-use diagnostics;
use strict;
use lib ".";
diff --git a/query.cgi b/query.cgi
index af4b54164..2ce900767 100755
--- a/query.cgi
+++ b/query.cgi
@@ -23,7 +23,6 @@
# Matthias Radestock <matthias@sorted.org>
# Gervase Markham <gerv@gerv.net>
-use diagnostics;
use strict;
use lib ".";
diff --git a/queryhelp.cgi b/queryhelp.cgi
index 16acf73f1..bfd7c0f69 100755
--- a/queryhelp.cgi
+++ b/queryhelp.cgi
@@ -24,7 +24,6 @@
use vars %::FORM;
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/quips.cgi b/quips.cgi
index a50bbc54a..7db312c61 100755
--- a/quips.cgi
+++ b/quips.cgi
@@ -22,7 +22,6 @@
# Gervase Markham <gerv@gerv.net>
# David Fallon <davef@tetsubo.com>
-use diagnostics;
use strict;
use vars qw(
diff --git a/relogin.cgi b/relogin.cgi
index 3bab9fdc5..493f5c200 100755
--- a/relogin.cgi
+++ b/relogin.cgi
@@ -21,7 +21,6 @@
# Contributor(s): Terry Weissman <terry@mozilla.org>
# Gervase Markham <gerv@gerv.net>
-use diagnostics;
use strict;
use vars %::COOKIE;
diff --git a/reports.cgi b/reports.cgi
index ac77c89fd..f557ac7f6 100755
--- a/reports.cgi
+++ b/reports.cgi
@@ -38,7 +38,6 @@
# Myk Melez <myk@mozilla.org):
# Implemented form field validation and reorganized code.
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/sanitycheck.cgi b/sanitycheck.cgi
index f35fb8ccf..451ad23da 100755
--- a/sanitycheck.cgi
+++ b/sanitycheck.cgi
@@ -21,7 +21,6 @@
# Contributor(s): Terry Weissman <terry@mozilla.org>
# Matthew Tuck <matty@chariot.net.au>
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/show_activity.cgi b/show_activity.cgi
index 59e43b672..f6d9b75c9 100755
--- a/show_activity.cgi
+++ b/show_activity.cgi
@@ -22,7 +22,6 @@
# Myk Melez <myk@mozilla.org>
# Gervase Markham <gerv@gerv.net>
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/show_bug.cgi b/show_bug.cgi
index f832a2930..6711ff7e6 100755
--- a/show_bug.cgi
+++ b/show_bug.cgi
@@ -20,7 +20,6 @@
#
# Contributor(s): Terry Weissman <terry@mozilla.org>
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/showattachment.cgi b/showattachment.cgi
index 4aaf6f17d..0c93483bd 100755
--- a/showattachment.cgi
+++ b/showattachment.cgi
@@ -21,7 +21,6 @@
# Contributor(s): Terry Weissman <terry@mozilla.org>
# Jacob Steenhagen <jake@acutex.net>
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi
index 2a5d20f6c..e5885d180 100755
--- a/showdependencygraph.cgi
+++ b/showdependencygraph.cgi
@@ -21,7 +21,6 @@
# Contributor(s): Terry Weissman <terry@mozilla.org>
# Gervase Markham <gerv@gerv.net>
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/showdependencytree.cgi b/showdependencytree.cgi
index 9b7060591..7917f00fe 100755
--- a/showdependencytree.cgi
+++ b/showdependencytree.cgi
@@ -23,7 +23,6 @@
# Christian Reis <kiko@async.com.br>
# Myk Melez <myk@mozilla.org>
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/sidebar.cgi b/sidebar.cgi
index 2805547cf..4f40d3cc0 100755
--- a/sidebar.cgi
+++ b/sidebar.cgi
@@ -16,7 +16,6 @@
# Contributor(s): Jacob Steenhagen <jake@acutex.net>
use strict;
-use diagnostics;
use lib ".";
require "CGI.pl";
diff --git a/syncshadowdb b/syncshadowdb
index 18c4528dc..ffe87eea3 100755
--- a/syncshadowdb
+++ b/syncshadowdb
@@ -21,7 +21,6 @@
# Contributor(s): Terry Weissman <terry@mozilla.org>
# David Gardiner <david.gardiner@unisa.edu.au>
-use diagnostics;
use strict;
require "globals.pl";
diff --git a/t/Support/Templates.pm b/t/Support/Templates.pm
index 07f46f700..c12f6ddcc 100644
--- a/t/Support/Templates.pm
+++ b/t/Support/Templates.pm
@@ -23,7 +23,6 @@
package Support::Templates;
-use diagnostics;
use strict;
use lib 't';
diff --git a/token.cgi b/token.cgi
index 2225e4f8b..43ee1b04e 100755
--- a/token.cgi
+++ b/token.cgi
@@ -25,7 +25,6 @@
############################################################################
# Make it harder for us to do dangerous things in Perl.
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/userprefs.cgi b/userprefs.cgi
index cf58cf265..33b377574 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -20,7 +20,6 @@
# Christopher Aillon <christopher@aillon.com>
# Gervase Markham <gerv@gerv.net>
-use diagnostics;
use strict;
use lib qw(.);
diff --git a/votes.cgi b/votes.cgi
index 513add4c3..88e303971 100755
--- a/votes.cgi
+++ b/votes.cgi
@@ -23,7 +23,6 @@
# Christopher Aillon <christopher@aillon.com>
# Gervase Markham <gerv@gerv.net>
-use diagnostics;
use strict;
use lib ".";
diff --git a/whineatnews.pl b/whineatnews.pl
index b364836a5..2a3bdf1b9 100755
--- a/whineatnews.pl
+++ b/whineatnews.pl
@@ -26,7 +26,6 @@
# assigned to them that has status NEW that has not been touched for
# more than 7 days.
-use diagnostics;
use strict;
require "globals.pl";
diff --git a/xml.cgi b/xml.cgi
index 8a0bbf1e4..219a39c74 100755
--- a/xml.cgi
+++ b/xml.cgi
@@ -22,7 +22,6 @@
# Terry Weissman <terry@mozilla.org>
# Gervase Markham <gerv@gerv.net>
-use diagnostics;
use strict;
use lib qw(.);