--- a/contrib/dumprevlog	Fri May 06 15:22:31 2011 +0200
+++ b/contrib/dumprevlog	Fri May 06 15:25:35 2011 +0200
@@ -6,7 +6,7 @@
 from mercurial import revlog, node, util
 
 for fp in (sys.stdin, sys.stdout, sys.stderr):
-    util.set_binary(fp)
+    util.setbinary(fp)
 
 for f in sys.argv[1:]:
     binopen = lambda fn: open(fn, 'rb')

--- a/contrib/simplemerge	Fri May 06 15:22:31 2011 +0200
+++ b/contrib/simplemerge	Fri May 06 15:25:35 2011 +0200
@@ -43,7 +43,7 @@
 
 try:
     for fp in (sys.stdin, sys.stdout, sys.stderr):
-        util.set_binary(fp)
+        util.setbinary(fp)
     
     opts = {}
     try:

--- a/contrib/undumprevlog	Fri May 06 15:22:31 2011 +0200
+++ b/contrib/undumprevlog	Fri May 06 15:25:35 2011 +0200
@@ -7,7 +7,7 @@
 from mercurial import revlog, node, scmutil, util, transaction
 
 for fp in (sys.stdin, sys.stdout, sys.stderr):
-    util.set_binary(fp)
+    util.setbinary(fp)
 
 opener = scmutil.opener('.', False)
 tr = transaction.transaction(sys.stderr.write, opener, "undump.journal")

--- a/hg	Fri May 06 15:22:31 2011 +0200
+++ b/hg	Fri May 06 15:25:35 2011 +0200
@@ -33,6 +33,6 @@
 import mercurial.dispatch
 
 for fp in (sys.stdin, sys.stdout, sys.stderr):
-    mercurial.util.set_binary(fp)
+    mercurial.util.setbinary(fp)
 
 mercurial.dispatch.run()

--- a/hgext/convert/subversion.py	Fri May 06 15:22:31 2011 +0200
+++ b/hgext/convert/subversion.py	Fri May 06 15:25:35 2011 +0200
@@ -112,8 +112,8 @@
     """Fetch SVN log in a subprocess and channel them back to parent to
     avoid memory collection issues.
     """
-    util.set_binary(sys.stdin)
-    util.set_binary(sys.stdout)
+    util.setbinary(sys.stdin)
+    util.setbinary(sys.stdout)
     args = decodeargs(sys.stdin.read())
     get_log_child(sys.stdout, *args)
 

--- a/mercurial/hgweb/wsgicgi.py	Fri May 06 15:22:31 2011 +0200
+++ b/mercurial/hgweb/wsgicgi.py	Fri May 06 15:25:35 2011 +0200
@@ -13,8 +13,8 @@
 from mercurial.hgweb import common
 
 def launch(application):
-    util.set_binary(sys.stdin)
-    util.set_binary(sys.stdout)
+    util.setbinary(sys.stdin)
+    util.setbinary(sys.stdout)
 
     environ = dict(os.environ.iteritems())
     environ.setdefault('PATH_INFO', '')

--- a/mercurial/posix.py	Fri May 06 15:22:31 2011 +0200
+++ b/mercurial/posix.py	Fri May 06 15:25:35 2011 +0200
@@ -128,7 +128,7 @@
     Returns None if the path is ok, or a UI string describing the problem.'''
     pass # on posix platforms, every path is ok
 
-def set_binary(fd):
+def setbinary(fd):
     pass
 
 def pconvert(path):

--- a/mercurial/sshserver.py	Fri May 06 15:22:31 2011 +0200
+++ b/mercurial/sshserver.py	Fri May 06 15:25:35 2011 +0200
@@ -21,8 +21,8 @@
         sys.stdout = sys.stderr
 
         # Prevent insertion/deletion of CRs
-        util.set_binary(self.fin)
-        util.set_binary(self.fout)
+        util.setbinary(self.fin)
+        util.setbinary(self.fout)
 
     def getargs(self, args):
         data = {}

--- a/mercurial/windows.py	Fri May 06 15:22:31 2011 +0200
+++ b/mercurial/windows.py	Fri May 06 15:25:35 2011 +0200
@@ -96,7 +96,7 @@
 def checklink(path):
     return False
 
-def set_binary(fd):
+def setbinary(fd):
     # When run without console, pipes may expose invalid
     # fileno(), usually set to -1.
     if hasattr(fd, 'fileno') and fd.fileno() >= 0: