[dw-free] Eliminate Class::Autouse from the code
[commit: http://hg.dwscoalition.org/dw-free/rev/3de2f6603098]
http://bugs.dwscoalition.org/show_bug.cgi?id=1761
More code cleanup, removing Class::Autouse calls.
Patch by
szabgab.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=1761
More code cleanup, removing Class::Autouse calls.
Patch by
![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png)
Files modified:
- cgi-bin/Apache/DebateSuicide.pm
- cgi-bin/Apache/LiveJournal.pm
- cgi-bin/Apache/LiveJournal/Interface/AtomAPI.pm
- cgi-bin/Apache/LiveJournal/Interface/ElsewhereInfo.pm
- cgi-bin/LJ/Widget/AddSiteMessages.pm
- cgi-bin/LJ/Widget/CreateAccountTheme.pm
- cgi-bin/LJ/Widget/CurrentTheme.pm
- cgi-bin/LJ/Widget/CustomizeTheme.pm
- cgi-bin/LJ/Widget/IPPU/SettingProd.pm
- cgi-bin/LJ/Widget/ManageQotD.pm
- cgi-bin/LJ/Widget/MoodThemeChooser.pm
- cgi-bin/LJ/Widget/QotD.pm
- cgi-bin/LJ/Widget/QotDArchive.pm
- cgi-bin/LJ/Widget/QotDResponses.pm
- cgi-bin/LJ/Widget/RecentlyExpunged.pm
- cgi-bin/LJ/Widget/ThemeChooser.pm
- cgi-bin/cleanhtml.pl
- cgi-bin/ljprotocol.pl
- src/DSMS/lib/DSMS/Message.pm
- src/DSMS/lib/DSMS/MessageAck.pm
-------------------------------------------------------------------------------- diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/Apache/DebateSuicide.pm --- a/cgi-bin/Apache/DebateSuicide.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/Apache/DebateSuicide.pm Tue Sep 15 22:43:49 2009 -0500 @@ -5,9 +5,7 @@ package Apache::DebateSuicide; use strict; use Apache2::Const qw/ :common /; -use Class::Autouse qw( - LJ::ModuleCheck - ); +use LJ::ModuleCheck; use vars qw($gtop); our %known_parent; diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/Apache/LiveJournal.pm --- a/cgi-bin/Apache/LiveJournal.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/Apache/LiveJournal.pm Tue Sep 15 22:43:49 2009 -0500 @@ -12,30 +12,21 @@ use Apache2::Const qw/ :common REDIRECT # needed to call S2::set_domain() so early: use LJ::S2; - -use Class::Autouse qw( - LJ::Blob - Apache::LiveJournal::Interface::Blogger - Apache::LiveJournal::Interface::AtomAPI - Apache::LiveJournal::Interface::S2 - Apache::LiveJournal::Interface::ElsewhereInfo - Apache::LiveJournal::PalImg - LJ::ModuleCheck - LJ::AccessLogSink - LJ::AccessLogRecord - LJ::AccessLogSink::Database - LJ::AccessLogSink::DInsertd - LJ::AccessLogSink::DBIProfile - ); - -# these aren't lazily loaded in the typical call-a-package-method way, -# but rather we just use Class::Autouse to bring them in during mod_perl -# load. in non-apache mode, they're loaded via LJ::ModuleCheck->have -use Class::Autouse qw( - Compress::Zlib - XMLRPC::Transport::HTTP - LJ::URI - ); +use LJ::Blob; +use Apache::LiveJournal::Interface::Blogger; +use Apache::LiveJournal::Interface::AtomAPI; +use Apache::LiveJournal::Interface::S2; +use Apache::LiveJournal::Interface::ElsewhereInfo; +use Apache::LiveJournal::PalImg; +use LJ::ModuleCheck; +use LJ::AccessLogSink; +use LJ::AccessLogRecord; +use LJ::AccessLogSink::Database; +use LJ::AccessLogSink::DInsertd; +use LJ::AccessLogSink::DBIProfile; +use Compress::Zlib; +use XMLRPC::Transport::HTTP; +use LJ::URI; BEGIN { $LJ::OPTMOD_ZLIB = eval "use Compress::Zlib (); 1;"; diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/Apache/LiveJournal/Interface/AtomAPI.pm --- a/cgi-bin/Apache/LiveJournal/Interface/AtomAPI.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/Apache/LiveJournal/Interface/AtomAPI.pm Tue Sep 15 22:43:49 2009 -0500 @@ -7,9 +7,7 @@ use Digest::SHA1; use Digest::SHA1; use MIME::Base64; use lib "$LJ::HOME/cgi-bin"; -use Class::Autouse qw( - LJ::ModuleCheck - ); +use LJ::ModuleCheck; require 'parsefeed.pl'; diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/Apache/LiveJournal/Interface/ElsewhereInfo.pm --- a/cgi-bin/Apache/LiveJournal/Interface/ElsewhereInfo.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/Apache/LiveJournal/Interface/ElsewhereInfo.pm Tue Sep 15 22:43:49 2009 -0500 @@ -5,9 +5,7 @@ use strict; use strict; use Apache2::Const qw(:common); use lib "$LJ::HOME/cgi-bin"; -use Class::Autouse qw( - JSON - ); +use JSON; # for Class::Autouse (so callers can 'ping' this method to lazy-load this class) sub load { 1 } diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/LJ/Widget/AddSiteMessages.pm --- a/cgi-bin/LJ/Widget/AddSiteMessages.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/LJ/Widget/AddSiteMessages.pm Tue Sep 15 22:43:49 2009 -0500 @@ -3,7 +3,7 @@ use strict; use strict; use base qw(LJ::Widget); use Carp qw(croak); -use Class::Autouse qw( LJ::SiteMessages ); +use LJ::SiteMessages; sub need_res { } diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/LJ/Widget/CreateAccountTheme.pm --- a/cgi-bin/LJ/Widget/CreateAccountTheme.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/LJ/Widget/CreateAccountTheme.pm Tue Sep 15 22:43:49 2009 -0500 @@ -3,7 +3,7 @@ use strict; use strict; use base qw(LJ::Widget); use Carp qw(croak); -use Class::Autouse qw( LJ::Customize ); +use LJ::Customize; sub need_res { qw( stc/widgets/createaccounttheme.css ) } diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/LJ/Widget/CurrentTheme.pm --- a/cgi-bin/LJ/Widget/CurrentTheme.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/LJ/Widget/CurrentTheme.pm Tue Sep 15 22:43:49 2009 -0500 @@ -3,7 +3,7 @@ use strict; use strict; use base qw(LJ::Widget); use Carp qw(croak); -use Class::Autouse qw( LJ::Customize ); +use LJ::Customize; sub ajax { 1 } sub authas { 1 } diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/LJ/Widget/CustomizeTheme.pm --- a/cgi-bin/LJ/Widget/CustomizeTheme.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/LJ/Widget/CustomizeTheme.pm Tue Sep 15 22:43:49 2009 -0500 @@ -3,7 +3,7 @@ use strict; use strict; use base qw(LJ::Widget); use Carp qw(croak); -use Class::Autouse qw( LJ::Customize ); +use LJ::Customize; sub authas { 1 } sub need_res { qw( stc/widgets/customizetheme.css ) } diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/LJ/Widget/IPPU/SettingProd.pm --- a/cgi-bin/LJ/Widget/IPPU/SettingProd.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/LJ/Widget/IPPU/SettingProd.pm Tue Sep 15 22:43:49 2009 -0500 @@ -3,10 +3,8 @@ use strict; use strict; use base qw(LJ::Widget::IPPU); use Carp qw(croak); -use Class::Autouse qw( - LJ::JSUtil - LJ::Setting - ); +use LJ::JSUtil; +use LJ::Setting; sub authas { 0 } diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/LJ/Widget/ManageQotD.pm --- a/cgi-bin/LJ/Widget/ManageQotD.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/LJ/Widget/ManageQotD.pm Tue Sep 15 22:43:49 2009 -0500 @@ -3,7 +3,7 @@ use strict; use strict; use base qw(LJ::Widget); use Carp qw(croak); -use Class::Autouse qw( LJ::QotD ); +use LJ::QotD; sub need_res { } diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/LJ/Widget/MoodThemeChooser.pm --- a/cgi-bin/LJ/Widget/MoodThemeChooser.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/LJ/Widget/MoodThemeChooser.pm Tue Sep 15 22:43:49 2009 -0500 @@ -3,7 +3,7 @@ use strict; use strict; use base qw(LJ::Widget); use Carp qw(croak); -use Class::Autouse qw( LJ::Customize ); +use LJ::Customize; sub ajax { 1 } sub authas { 1 } diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/LJ/Widget/QotD.pm --- a/cgi-bin/LJ/Widget/QotD.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/LJ/Widget/QotD.pm Tue Sep 15 22:43:49 2009 -0500 @@ -3,7 +3,7 @@ use strict; use strict; use base qw(LJ::Widget); use Carp qw(croak); -use Class::Autouse qw( LJ::QotD ); +use LJ::QotD; sub need_res { return qw( js/widgets/qotd.js stc/widgets/qotd.css ); diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/LJ/Widget/QotDArchive.pm --- a/cgi-bin/LJ/Widget/QotDArchive.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/LJ/Widget/QotDArchive.pm Tue Sep 15 22:43:49 2009 -0500 @@ -3,7 +3,7 @@ use strict; use strict; use base qw(LJ::Widget); use Carp qw(croak); -use Class::Autouse qw( LJ::QotD ); +use LJ::QotD; sub need_res { return qw( stc/widgets/qotdarchive.css ); diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/LJ/Widget/QotDResponses.pm --- a/cgi-bin/LJ/Widget/QotDResponses.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/LJ/Widget/QotDResponses.pm Tue Sep 15 22:43:49 2009 -0500 @@ -3,7 +3,7 @@ use strict; use strict; use base qw(LJ::Widget); use Carp qw(croak); -use Class::Autouse qw( LJ::QotD ); +use LJ::QotD; sub need_res { return qw( js/widgets/qotd.js stc/widgets/qotd.css stc/widgets/qotdresponses.css ); diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/LJ/Widget/RecentlyExpunged.pm --- a/cgi-bin/LJ/Widget/RecentlyExpunged.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/LJ/Widget/RecentlyExpunged.pm Tue Sep 15 22:43:49 2009 -0500 @@ -3,8 +3,7 @@ use strict; use strict; use base qw(LJ::Widget); use Carp qw(croak); - -use Class::Autouse qw(LJ::ExpungedUsers); +use LJ::ExpungedUsers; sub need_res { return qw( stc/widgets/recentlyexpunged.css ); diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/LJ/Widget/ThemeChooser.pm --- a/cgi-bin/LJ/Widget/ThemeChooser.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/LJ/Widget/ThemeChooser.pm Tue Sep 15 22:43:49 2009 -0500 @@ -3,7 +3,8 @@ use strict; use strict; use base qw(LJ::Widget); use Carp qw(croak); -use Class::Autouse qw( LJ::S2Theme LJ::Customize ); +use LJ::S2Theme; +use LJ::Customize; sub ajax { 1 } sub authas { 1 } diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/cleanhtml.pl --- a/cgi-bin/cleanhtml.pl Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/cleanhtml.pl Tue Sep 15 22:43:49 2009 -0500 @@ -1,14 +1,12 @@ #!/usr/bin/perl use strict; -use Class::Autouse qw( - URI - HTMLCleaner - LJ::CSS::Cleaner - HTML::TokeParser - LJ::EmbedModule - LJ::Config - ); +use URI; +use HTMLCleaner; +use LJ::CSS::Cleaner; +use HTML::TokeParser; +use LJ::EmbedModule; +use LJ::Config; LJ::Config->load; diff -r 62ae6df38908 -r 3de2f6603098 cgi-bin/ljprotocol.pl --- a/cgi-bin/ljprotocol.pl Tue Sep 15 22:09:31 2009 -0500 +++ b/cgi-bin/ljprotocol.pl Tue Sep 15 22:43:49 2009 -0500 @@ -1357,7 +1357,6 @@ sub postevent my $jitemid = LJ::alloc_user_counter($uowner, "L"); return $fail->($err,501,"No itemid could be generated.") unless $jitemid; - # bring in LJ::Entry with Class::Autouse LJ::Entry->can("dostuff"); LJ::replycount_do($uowner, $jitemid, "init"); diff -r 62ae6df38908 -r 3de2f6603098 src/DSMS/lib/DSMS/Message.pm --- a/src/DSMS/lib/DSMS/Message.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/src/DSMS/lib/DSMS/Message.pm Tue Sep 15 22:43:49 2009 -0500 @@ -18,7 +18,7 @@ package DSMS::Message; use strict; use Carp qw(croak); -use Class::Autouse qw(Encode); +use Encode; sub new { my $class = shift; diff -r 62ae6df38908 -r 3de2f6603098 src/DSMS/lib/DSMS/MessageAck.pm --- a/src/DSMS/lib/DSMS/MessageAck.pm Tue Sep 15 22:09:31 2009 -0500 +++ b/src/DSMS/lib/DSMS/MessageAck.pm Tue Sep 15 22:43:49 2009 -0500 @@ -17,7 +17,7 @@ package DSMS::MessageAck; use strict; use Carp qw(croak); -use Class::Autouse qw(Encode); +use Encode; sub new { my $class = shift; --------------------------------------------------------------------------------