move use

[ikiwiki.git] / IkiWiki / Plugin / rst.pm
diff --git a/IkiWiki/Plugin/rst.pm b/IkiWiki/Plugin/rst.pm

index 6bf11fe36561c516d1bd10b6e58af34396157df5..1fd13d1f5ceca92262cbbfb70d86e979c9ff7d88 100644 (file)
--- a/IkiWiki/Plugin/rst.pm
+++ b/IkiWiki/Plugin/rst.pm
@@ -36,23 +36,25 @@ print html[html.find('<body>')+6:html.find('</body>')].strip();
  ";
  
  sub import { #{{{
-       IkiWiki::hook(type => "htmlize", id => "rst", call => \&htmlize);
+       hook(type => "htmlize", id => "rst", call => \&htmlize);
  } # }}}
  
-sub htmlize ($) { #{{{
-       my $content=shift;
+sub htmlize (@) { #{{{
+       my %params=@_;
+       my $content=$params{content};
  
         my $tries=10;
+       my $pid;
         while (1) {
                 eval {
                         # Try to call python and run our command
-                       open2(*IN, *OUT, "python", "-c",  $pyCmnd)
+                       $pid=open2(*IN, *OUT, "python", "-c",  $pyCmnd)
                                 or return $content;
                 };
                 last unless $@;
                 $tries--;
                 if ($tries < 1) {
-                       IkiWiki::debug("failed to run python to convert rst: $@");
+                       debug("failed to run python to convert rst: $@");
                         return $content;
                 }
         }
@@ -62,8 +64,13 @@ sub htmlize ($) { #{{{
         
         print OUT $content;
         close OUT;
+
         local $/ = undef;
-       return <IN>;
+       my $ret=<IN>;
+       close IN;
+       waitpid $pid, 0;
+
+       return $ret;
  } # }}}
  
  1