[dw-free] Eliminate Class::Autouse from the code
[commit: http://hg.dwscoalition.org/dw-free/rev/dbd42124e637]
http://bugs.dwscoalition.org/show_bug.cgi?id=1761
Remove more Class::Autouse.
Patch by
szabgab.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=1761
Remove more Class::Autouse.
Patch by
Files modified:
- cgi-bin/LJ/Blob.pm
- cgi-bin/LJ/Comment.pm
- cgi-bin/LJ/Directory/SetHandle/Mogile.pm
- cgi-bin/LJ/Entry.pm
- cgi-bin/LJ/Image.pm
- cgi-bin/LJ/Lang.pm
- cgi-bin/LJ/MassPrivacy.pm
- cgi-bin/LJ/Message.pm
- cgi-bin/LJ/NotificationInbox.pm
- cgi-bin/LJ/NotificationMethod.pm
- cgi-bin/LJ/Poll.pm
- cgi-bin/LJ/S2.pm
- cgi-bin/LJ/S2Theme.pm
- cgi-bin/LJ/Session.pm
- cgi-bin/LJ/Subscription.pm
- cgi-bin/LJ/Subscription/Pending.pm
- cgi-bin/LJ/Test.pm
- cgi-bin/LJ/TextMessage.pm
- cgi-bin/LJ/Userpic.pm
--------------------------------------------------------------------------------
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/Blob.pm
--- a/cgi-bin/LJ/Blob.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/Blob.pm Sun Sep 13 05:02:24 2009 +0000
@@ -3,10 +3,8 @@ package LJ::Blob;
package LJ::Blob;
use strict;
use lib "$LJ::HOME/cgi-bin";
-use Class::Autouse qw(
- BlobClient
- BlobClient::Local
- );
+use BlobClient;
+use BlobClient::Local;
my %bc_cache = ();
my %bc_reader_cache = ();
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/Comment.pm
--- a/cgi-bin/LJ/Comment.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/Comment.pm Sun Sep 13 05:02:24 2009 +0000
@@ -8,9 +8,7 @@ package LJ::Comment;
use strict;
use Carp qw/ croak /;
-use Class::Autouse qw(
- LJ::Entry
- );
+use LJ::Entry;
use lib "$LJ::HOME/cgi-bin";
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/Directory/SetHandle/Mogile.pm
--- a/cgi-bin/LJ/Directory/SetHandle/Mogile.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/Directory/SetHandle/Mogile.pm Sun Sep 13 05:02:24 2009 +0000
@@ -1,7 +1,7 @@ package LJ::Directory::SetHandle::Mogile
package LJ::Directory::SetHandle::Mogile;
use strict;
use base 'LJ::Directory::SetHandle';
-use Class::Autouse qw (LWP::UserAgent);
+use LWP::UserAgent;
sub new {
my ($class, $conskey) = @_;
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/Entry.pm
--- a/cgi-bin/LJ/Entry.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/Entry.pm Sun Sep 13 05:02:24 2009 +0000
@@ -999,10 +999,9 @@ sub put_logprop_in_history {
package LJ;
-use Class::Autouse qw (
- LJ::Poll
- LJ::EmbedModule
- );
+use Carp qw(confess);
+use LJ::Poll;
+use LJ::EmbedModule;
# <LJFUNC>
# name: LJ::get_logtext2multi
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/Image.pm
--- a/cgi-bin/LJ/Image.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/Image.pm Sun Sep 13 05:02:24 2009 +0000
@@ -1,7 +1,7 @@ package LJ::Image;
package LJ::Image;
use strict;
use Carp qw(croak);
-use Class::Autouse qw( Image::Size );
+use Image::Size;
# given an image and some dimensions, will return the dimensions that the image
# should be if it was resized to be no greater than the given dimensions
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/Lang.pm
--- a/cgi-bin/LJ/Lang.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/Lang.pm Sun Sep 13 05:02:24 2009 +0000
@@ -1,10 +1,6 @@ package LJ::Lang;
package LJ::Lang;
use strict;
-
-use Class::Autouse qw(
-
- LJ::LangDatFile
- );
+use LJ::LangDatFile;
use constant MAXIMUM_ITCODE_LENGTH => 80;
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/MassPrivacy.pm
--- a/cgi-bin/LJ/MassPrivacy.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/MassPrivacy.pm Sun Sep 13 05:02:24 2009 +0000
@@ -155,7 +155,7 @@ package LJ::Worker::MassPrivacy;
package LJ::Worker::MassPrivacy;
use base 'TheSchwartz::Worker';
-use Class::Autouse qw(LJ::MassPrivacy);
+use LJ::MassPrivacy;
sub work {
my ($class, $job) = @_;
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/Message.pm
--- a/cgi-bin/LJ/Message.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/Message.pm Sun Sep 13 05:02:24 2009 +0000
@@ -1,10 +1,7 @@ package LJ::Message;
package LJ::Message;
use strict;
use Carp qw/ croak /;
-
-use Class::Autouse qw(
- LJ::Typemap
- );
+use LJ::Typemap;
my %singletons = (); # journalid-msgid
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/NotificationInbox.pm
--- a/cgi-bin/LJ/NotificationInbox.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/NotificationInbox.pm Sun Sep 13 05:02:24 2009 +0000
@@ -6,7 +6,9 @@ package LJ::NotificationInbox;
use strict;
use Carp qw(croak);
-use Class::Autouse qw (LJ::NotificationItem LJ::Event LJ::NotificationArchive);
+use LJ::NotificationItem;
+use LJ::Event;
+use LJ::NotificationArchive;
# constructor takes a $u
sub new {
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/NotificationMethod.pm
--- a/cgi-bin/LJ/NotificationMethod.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/NotificationMethod.pm Sun Sep 13 05:02:24 2009 +0000
@@ -2,12 +2,11 @@ use strict;
use strict;
use Carp qw/ croak /;
-use Class::Autouse qw (LJ::Typemap
- LJ::NotificationMethod::Email
- LJ::NotificationMethod::Inbox
- LJ::NotificationMethod::IM
- LJ::NotificationMethod::DebugLog
- );
+use LJ::Typemap;
+use LJ::NotificationMethod::Email;
+use LJ::NotificationMethod::Inbox;
+use LJ::NotificationMethod::IM;
+use LJ::NotificationMethod::DebugLog;
# this is basically just an interface
# Mischa's contribution: "straight up"
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/Poll.pm
--- a/cgi-bin/LJ/Poll.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/Poll.pm Sun Sep 13 05:02:24 2009 +0000
@@ -1,7 +1,10 @@ package LJ::Poll;
package LJ::Poll;
use strict;
use Carp qw (croak);
-use Class::Autouse qw (LJ::Entry LJ::Poll::Question LJ::Event::PollVote LJ::Typemap);
+use LJ::Entry;
+use LJ::Poll::Question;
+use LJ::Event::PollVote;
+use LJ::Typemap;
##
## Memcache routines
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/S2.pm
--- a/cgi-bin/LJ/S2.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/S2.pm Sun Sep 13 05:02:24 2009 +0000
@@ -7,20 +7,18 @@ use lib "$LJ::HOME/src/s2";
use lib "$LJ::HOME/src/s2";
use S2;
use S2::Color;
-use Class::Autouse qw(
- S2::Checker
- S2::Compiler
- HTMLCleaner
- LJ::CSS::Cleaner
- LJ::S2::RecentPage
- LJ::S2::YearPage
- LJ::S2::DayPage
- LJ::S2::FriendsPage
- LJ::S2::MonthPage
- LJ::S2::EntryPage
- LJ::S2::ReplyPage
- LJ::S2::TagsPage
- );
+use S2::Checker;
+use S2::Compiler;
+use HTMLCleaner;
+use LJ::CSS::Cleaner;
+use LJ::S2::RecentPage;
+use LJ::S2::YearPage;
+use LJ::S2::DayPage;
+use LJ::S2::FriendsPage;
+use LJ::S2::MonthPage;
+use LJ::S2::EntryPage;
+use LJ::S2::ReplyPage;
+use LJ::S2::TagsPage;
use Storable;
use Apache2::Const qw/ :common /;
use POSIX ();
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/S2Theme.pm
--- a/cgi-bin/LJ/S2Theme.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/S2Theme.pm Sun Sep 13 05:02:24 2009 +0000
@@ -1,7 +1,7 @@ package LJ::S2Theme;
package LJ::S2Theme;
use strict;
use Carp qw(croak);
-use Class::Autouse qw( LJ::Customize );
+use LJ::Customize;
use LJ::ModuleLoader;
LJ::ModuleLoader->autouse_subclasses("LJ::S2Theme");
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/Session.pm
--- a/cgi-bin/LJ/Session.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/Session.pm Sun Sep 13 05:02:24 2009 +0000
@@ -2,9 +2,7 @@ use strict;
use strict;
use Carp qw(croak);
use Digest::HMAC_SHA1 qw(hmac_sha1 hmac_sha1_hex);
-use Class::Autouse qw(
- LJ::EventLogRecord::SessionExpired
- );
+use LJ::EventLogRecord::SessionExpired;
use constant VERSION => 1;
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/Subscription.pm
--- a/cgi-bin/LJ/Subscription.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/Subscription.pm Sun Sep 13 05:02:24 2009 +0000
@@ -1,12 +1,10 @@ package LJ::Subscription;
package LJ::Subscription;
use strict;
use Carp qw(croak confess);
-use Class::Autouse qw(
- LJ::NotificationMethod
- LJ::Typemap
- LJ::Event
- LJ::Subscription::Pending
- );
+use LJ::NotificationMethod;
+use LJ::Typemap;
+use LJ::Event;
+use LJ::Subscription::Pending;
use constant {
INACTIVE => 1 << 0, # user has deactivated
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/Subscription/Pending.pm
--- a/cgi-bin/LJ/Subscription/Pending.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/Subscription/Pending.pm Sun Sep 13 05:02:24 2009 +0000
@@ -5,7 +5,8 @@ use base 'LJ::Subscription';
use base 'LJ::Subscription';
use strict;
use Carp qw(croak carp);
-use Class::Autouse qw (LJ::Event LJ::NotificationMethod);
+use LJ::Event;
+use LJ::NotificationMethod;
sub new {
my $class = shift;
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/Test.pm
--- a/cgi-bin/LJ/Test.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/Test.pm Sun Sep 13 05:02:24 2009 +0000
@@ -11,10 +11,8 @@ use vars qw(@ISA @EXPORT);
# Test::FakeApache because that really fucks with things.
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-use Class::Autouse qw(
- DBI
- LJ::ModuleCheck
- );
+use DBI;
+use LJ::ModuleCheck;
@ISA = qw(Exporter);
@EXPORT = qw(memcache_stress with_fake_memcache temp_user temp_comm temp_feed fake_apache);
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/TextMessage.pm
--- a/cgi-bin/LJ/TextMessage.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/TextMessage.pm Sun Sep 13 05:02:24 2009 +0000
@@ -17,12 +17,9 @@ package LJ::TextMessage;
package LJ::TextMessage;
use URI::Escape; # FIXME: don't use this (uri_escape() below), when we have LJ::eurl() as our standard
-
-use Class::Autouse qw(
- HTTP::Request
- LWP::UserAgent
- MIME::Lite
- );
+use HTTP::Request;
+use LWP::UserAgent;
+use MIME::Lite;
use strict;
use vars qw($VERSION %providers);
diff -r 3743ffa4a22d -r dbd42124e637 cgi-bin/LJ/Userpic.pm
--- a/cgi-bin/LJ/Userpic.pm Sun Sep 13 04:54:03 2009 +0000
+++ b/cgi-bin/LJ/Userpic.pm Sun Sep 13 05:02:24 2009 +0000
@@ -2,7 +2,7 @@ use strict;
use strict;
use Carp qw(croak);
use Digest::MD5;
-use Class::Autouse qw (LJ::Event::NewUserpic);
+use LJ::Event::NewUserpic;
use LJ::Constants;
##
--------------------------------------------------------------------------------
