# HG changeset patch
# User Lee Cantey <lcantey@gmail.com>
# Date 1182204374 25200
# Node ID d4e4d0f4fba4309bd214d4b61f6da31f4317c104
# Parent  eb99af2d845e1617ab99db326eb8c61a58f100ea# Parent  eaf87cd193373cef5c3d8b2989c015f93bfdd469
Merge with crew

diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -161,7 +161,7 @@ def cachefunc(func):
 
 def pipefilter(s, cmd):
     '''filter string S through command CMD, returning its output'''
-    (pout, pin) = popen2.popen2(cmd, -1, 'b')
+    (pin, pout) = os.popen2(cmd, 'b')
     def writer():
         try:
             pin.write(s)