[Rt-commit] r6965 - rt/branches/3.6-RELEASE/lib/RT

[ruz at bestpractical.com]

Author: ruz
Date: Wed Feb  7 20:45:29 2007
New Revision: 6965

Modified:
   rt/branches/3.6-RELEASE/lib/RT/I18N.pm
   rt/branches/3.6-RELEASE/lib/RT/Record.pm

Log:
* we depend on perl 5.8 so we don't need Encode::compat at all

Modified: rt/branches/3.6-RELEASE/lib/RT/I18N.pm
==============================================================================
--- rt/branches/3.6-RELEASE/lib/RT/I18N.pm	(original)
+++ rt/branches/3.6-RELEASE/lib/RT/I18N.pm	Wed Feb  7 20:45:29 2007
@@ -52,23 +52,19 @@
 package RT::I18N;
 
 use strict;
+use warnings;
+
 use Locale::Maketext 1.04;
 use Locale::Maketext::Lexicon 0.25;
 use base ('Locale::Maketext::Fuzzy');
-use vars qw( %Lexicon );
 
-#If we're running on 5.6, we desperately need Encode::compat. But if we're on 5.8, we don't really need it.
-BEGIN { if ($] < 5.007001) {
-require Encode::compat;
-} }
 use Encode;
-
 use MIME::Entity;
 use MIME::Head;
 
 # I decree that this project's first language is English.
 
-%Lexicon = (
+our %Lexicon = (
    'TEST_STRING' => 'Concrete Mixer',
 
     '__Content-Type' => 'text/plain; charset=utf-8',

Modified: rt/branches/3.6-RELEASE/lib/RT/Record.pm
==============================================================================
--- rt/branches/3.6-RELEASE/lib/RT/Record.pm	(original)
+++ rt/branches/3.6-RELEASE/lib/RT/Record.pm	Wed Feb  7 20:45:29 2007
@@ -64,18 +64,22 @@
 =cut
 
 package RT::Record;
+
+use strict;
+use warnings;
+
+use base qw(RT::Base);
+
 use RT::Date;
 use RT::User;
 use RT::Attributes;
-use RT::Base;
 use DBIx::SearchBuilder::Record::Cachable;
+use Encode qw();
 
-use strict;
-use vars qw/@ISA $_TABLE_ATTR/;
+our $_TABLE_ATTR = { };
 
- at ISA = qw(RT::Base);
 
-if ($RT::DontCacheSearchBuilderRecords ) {
+if ( $RT::DontCacheSearchBuilderRecords ) {
     push (@ISA, 'DBIx::SearchBuilder::Record');
 } else {
     push (@ISA, 'DBIx::SearchBuilder::Record::Cachable');
@@ -654,11 +658,6 @@
 
 }
 
-require Encode::compat if $] < 5.007001;
-require Encode;
-
-
-
 
 sub __Value {
     my $self  = shift;