# HG changeset patch
# User Steve Borho <steve@borho.org>
# Date 1292264366 21600
# Node ID 873c032c81b50ff05e48019bc1058f2c59f1a497
# Parent  ece1c069ddd6b77b9f5bbf606eb7cc8175e52bd2# Parent  dbc546811dd6eb672756f9266d432bb9c1101adb
Merge with stable

diff -r ece1c069ddd6 -r 873c032c81b5 mercurial/util.py
--- a/mercurial/util.py	Mon Dec 13 11:53:17 2010 +0100
+++ b/mercurial/util.py	Mon Dec 13 12:19:26 2010 -0600
@@ -391,7 +391,8 @@
             return '1'
         return str(val)
     origcmd = cmd
-    if os.name == 'nt':
+    if os.name == 'nt' and sys.version_info < (2, 7, 1):
+        # Python versions since 2.7.1 do this extra quoting themselves
         cmd = '"%s"' % cmd
     env = dict(os.environ)
     env.update((k, py2shell(v)) for k, v in environ.iteritems())