s/use vars/our/g modules that aren't independently maintained on CPAN

[perl5.git] / lib / Time / Local.pm

diff --git a/lib/Time/Local.pm b/lib/Time/Local.pm
index 7a10d98..f3f6f54 100644 (file)
--- a/lib/Time/Local.pm
+++ b/lib/Time/Local.pm
@@ -5,17 +5,7 @@ use Carp;
 
 @ISA           = qw( Exporter );
 @EXPORT                = qw( timegm timelocal );
-@EXPORT_OK     = qw( $no_range_check );
-
-sub import {
-    my $package = shift;
-    my @args;
-    for (@_) {
-       $no_range_check = 1, next       if $_ eq 'no_range_check';
-       push @args, $_;
-    }
-    Time::Local->export_to_level(1, $package, @args);
-}
+@EXPORT_OK     = qw( timegm_nocheck timelocal_nocheck );
 
 # Set up constants
     $SEC  = 1;
@@ -28,6 +18,8 @@ sub import {
     $breakpoint = ($thisYear + 50) % 100;
     $nextCentury += 100 if $breakpoint < 50;
 
+my %options;
+
 sub timegm {
     my (@date) = @_;
     if ($date[5] > 999) {
@@ -46,6 +38,11 @@ sub timegm {
     + ($date[3]-1) * $DAY;
 }
 
+sub timegm_nocheck {
+    local $options{no_range_check} = 1;
+    &timegm;
+}
+
 sub timelocal {
     my $t = &timegm;
     my $tt = $t;
@@ -80,10 +77,15 @@ sub timelocal {
     $time;
 }
 
+sub timelocal_nocheck {
+    local $options{no_range_check} = 1;
+    &timelocal;
+}
+
 sub cheat {
     $year = $_[5];
     $month = $_[4];
-    unless ($no_range_check) {
+    unless ($options{no_range_check}) {
        croak "Month '$month' out of range 0..11" if $month > 11 || $month < 0;
        croak "Day '$_[3]' out of range 1..31"    if $_[3] > 31 || $_[3] < 1;
        croak "Hour '$_[2]' out of range 0..23"   if $_[2] > 23 || $_[2] < 0;
@@ -149,25 +151,25 @@ the values provided.  While the day of the month is expected to be in
 the range 1..31, the month should be in the range 0..11.  
 This is consistent with the values returned from localtime() and gmtime().
 
-Also worth noting is the ability to disable the range checking that
-would normally occur on the input $sec, $min, $hours, $mday, and $mon
-values.  You can do this by setting $Time::Local::no_range_check = 1,
-or by invoking the module with C<use Time::Local 'no_range_check'>.
-This enables you to abuse the terminology somewhat and gain the
-flexibilty to do things like:
+The timelocal() and timegm() functions perform range checking on the
+input $sec, $min, $hours, $mday, and $mon values by default.  If you'd
+rather they didn't, you can explicitly import the timelocal_nocheck()
+and timegm_nocheck() functions.
 
-       use Time::Local qw( no_range_check );
+       use Time::Local 'timelocal_nocheck';
+       
+       {
+           # The 365th day of 1999
+           print scalar localtime timelocal_nocheck 0,0,0,365,0,99;
 
-       # The 365th day of 1999
-       print scalar localtime timelocal 0,0,0,365,0,99;
+           # The twenty thousandth day since 1970
+           print scalar localtime timelocal_nocheck 0,0,0,20000,0,70;
 
-       # The twenty thousandth day since 1970
-       print scalar localtime timelocal 0,0,0,20000,0,70;
-
-       # And even the 10,000,000th second since 1999!
-       print scalar localtime timelocal 10000000,0,0,1,0,99;
+           # And even the 10,000,000th second since 1999!
+           print scalar localtime timelocal_nocheck 10000000,0,0,1,0,99;
+       }
 
-Your mileage may vary when trying this trick with minutes and hours,
+Your mileage may vary when trying these with minutes and hours,
 and it doesn't work at all for months.
 
 Strictly speaking, the year should also be specified in a form consistent