[Catalyst-commits] r6980 - in Catalyst-Runtime/5.80/trunk: . lib lib/Catalyst/DispatchType

[andyg at dev.catalyst.perl.org]

Author: andyg
Date: 2007-10-10 16:42:04 +0100 (Wed, 10 Oct 2007)
New Revision: 6980

Modified:
   Catalyst-Runtime/5.80/trunk/
   Catalyst-Runtime/5.80/trunk/Changes
   Catalyst-Runtime/5.80/trunk/Makefile.PL
   Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
   Catalyst-Runtime/5.80/trunk/lib/Catalyst/DispatchType/Chained.pm
Log:
 r22578 at macbookpro-eth (orig r6955):  lbr | 2007-10-03 20:04:27 -0400
 don't waste tester time (and ours)
 r22588 at macbookpro-eth (orig r6965):  gbjk | 2007-10-08 07:22:37 -0400
 Chained: Fix Args check treating undefind Args the same as 0.
 
 r22631 at macbookpro-eth (orig r6979):  andyg | 2007-10-10 11:41:18 -0400
 Removed unnecessary sprintf in debug mode that caused warnings on locales where commas are used for decimal markers.



Property changes on: Catalyst-Runtime/5.80/trunk
___________________________________________________________________
Name: svk:merge
   - 1c72fc7c-9ce4-42af-bf25-3bfe470ff1e8:/local/Catalyst/trunk/Catalyst-Runtime:9763
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/trunk:6945
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-ChildOf:4443
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-Runtime-jrockway:5857
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-component-setup:4320
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-docs:4325
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/current/Catalyst-Runtime:5142
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Runtime:6165
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime:8339
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime-jrockway:8342
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime:6511
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime-current:10442
   + 1c72fc7c-9ce4-42af-bf25-3bfe470ff1e8:/local/Catalyst/trunk/Catalyst-Runtime:9763
4ad37cd2-5fec-0310-835f-b3785c72a374:/Catalyst-Runtime/5.70/trunk:6979
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-ChildOf:4443
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-Runtime-jrockway:5857
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-component-setup:4320
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-docs:4325
4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/current/Catalyst-Runtime:5142
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst:4483
4ad37cd2-5fec-0310-835f-b3785c72a374:/trunk/Catalyst-Runtime:6165
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime:8339
d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst/Catalyst-Runtime-jrockway:8342
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime:6511
e56d974f-7718-0410-8b1c-b347a71765b2:/local/Catalyst-Runtime-current:10442

Modified: Catalyst-Runtime/5.80/trunk/Changes
===================================================================
--- Catalyst-Runtime/5.80/trunk/Changes	2007-10-10 15:41:18 UTC (rev 6979)
+++ Catalyst-Runtime/5.80/trunk/Changes	2007-10-10 15:42:04 UTC (rev 6980)
@@ -13,6 +13,8 @@
           (Gavin Henry, Tatsuhiko Miyagawa)
         - Fixed bug where req->base and req->uri would include a port number when running
           in SSL mode.
+        - Removed unnecessary sprintf in debug mode that caused warnings on locales where
+          commas are used for decimal markers.
 
 5.7010  2007-08-22 07:41:00
         - Resource forks in 5.7009

Modified: Catalyst-Runtime/5.80/trunk/Makefile.PL
===================================================================
--- Catalyst-Runtime/5.80/trunk/Makefile.PL	2007-10-10 15:41:18 UTC (rev 6979)
+++ Catalyst-Runtime/5.80/trunk/Makefile.PL	2007-10-10 15:42:04 UTC (rev 6980)
@@ -1,5 +1,6 @@
 use inc::Module::Install 0.64;
 
+use 5.008001; 
 perl_version '5.8.1';
 
 name 'Catalyst-Runtime';

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst/DispatchType/Chained.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst/DispatchType/Chained.pm	2007-10-10 15:41:18 UTC (rev 6979)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst/DispatchType/Chained.pm	2007-10-10 15:42:04 UTC (rev 6980)
@@ -181,7 +181,7 @@
 
                 if (!$best_action                       ||
                     @parts < @{$best_action->{parts}}   ||
-                    (!@parts && $args_attr == 0)){
+                    (!@parts && $args_attr eq 0)){
                     $best_action = {
                         actions => [ $action ],
                         captures=> [],

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2007-10-10 15:41:18 UTC (rev 6979)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2007-10-10 15:42:04 UTC (rev 6980)
@@ -1353,7 +1353,7 @@
     }
     
     if ($c->debug) {
-        my $elapsed = sprintf '%f', tv_interval($c->stats->getNodeValue);
+        my $elapsed = tv_interval($c->stats->getNodeValue);
         my $av = $elapsed == 0 ? '??' : sprintf '%.3f', 1 / $elapsed;
         
         my $t = Text::SimpleTable->new( [ 62, 'Action' ], [ 9, 'Time' ] );