[Jifty-commit] r1251 - in jifty/trunk: lib/Jifty

[jifty-commit at lists.jifty.org]

Author: clkao
Date: Sun Jun 11 01:01:10 2006
New Revision: 1251

Modified:
   jifty/trunk/Makefile.PL
   jifty/trunk/lib/Jifty/Continuation.pm
   jifty/trunk/lib/Jifty/Request.pm

Log:
Use Storable::dclone instead of Clone::clone.


Modified: jifty/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL	(original)
+++ jifty/trunk/Makefile.PL	Sun Jun 11 01:01:10 2006
@@ -9,7 +9,6 @@
 requires('Class::Accessor'); # Class::Accessor::Fast
 requires('Class::Container');
 requires('Class::Data::Inheritable');
-requires('Clone');
 requires('Compress::Zlib');
 requires('CSS::Squish' => 0.01 );
 requires('DBD::SQLite' => 1.11 );

Modified: jifty/trunk/lib/Jifty/Continuation.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Continuation.pm	(original)
+++ jifty/trunk/lib/Jifty/Continuation.pm	Sun Jun 11 01:01:10 2006
@@ -37,7 +37,7 @@
 =cut
 
 use Jifty::Everything;
-use Clone;
+use Storable 'dclone';
 
 use base qw/Class::Accessor::Fast/;
 
@@ -109,7 +109,7 @@
 
     # We're cloning most of our attributes from a previous continuation
     if ($args{clone} and Jifty->web->session->get_continuation($args{clone})) {
-        $self = Clone::clone(Jifty->web->session->get_continuation($args{clone}));
+        $self = dclone(Jifty->web->session->get_continuation($args{clone}));
         for (grep {/^J:A/} keys %{$args{request}->arguments}) {
             $self->request->argument($_ => $args{request}->arguments->{$_});
         }
@@ -168,7 +168,7 @@
           if $self->request->path =~ m{[^A-Za-z0-9\-_.!~*'()/?&;+]};
 
         # Clone our request
-        my $request = Clone::clone($self->request);
+        my $request = dclone($self->request);
         
         # Fill in return value(s) into correct part of $request
         $request->do_mapping;
@@ -178,7 +178,7 @@
         # in.  For safety, monikers from the saved continuation
         # override those from the request prior to the call
         if (Jifty->web->response->results) {
-            $response = Clone::clone(Jifty->web->response);
+            $response = dclone(Jifty->web->response);
             my %results = $self->response->results;
             $response->result($_ => $results{$_}) for keys %results;
         }
@@ -204,7 +204,7 @@
         my %results = $self->response->results;
         for (keys %results) {
             next if Jifty->web->response->result($_);
-            Jifty->web->response->result($_,Clone::clone($results{$_}));
+            Jifty->web->response->result($_,dclone($results{$_}));
         }
 
         # Run any code in the continuation
@@ -212,7 +212,7 @@
           if $self->code;
 
         # Enter the request in the continuation, and handle it
-        Jifty->web->request(Clone::clone($self->request));
+        Jifty->web->request(dclone($self->request));
         Jifty->web->handle_request();
     }
 }

Modified: jifty/trunk/lib/Jifty/Request.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Request.pm	(original)
+++ jifty/trunk/lib/Jifty/Request.pm	Sun Jun 11 01:01:10 2006
@@ -3,7 +3,7 @@
 
 package Jifty::Request;
 
-use base qw/Jifty::Object Class::Accessor::Fast Clone/;
+use base qw/Jifty::Object Class::Accessor::Fast/;
 __PACKAGE__->mk_accessors(qw(_top_request arguments just_validating path _continuation));
 
 use Jifty::JSON;