Merge with stable
authorSteve Borho <steve@borho.org>
Mon, 13 Dec 2010 12:19:26 -0600
changeset 13129 873c032c81b5
parent 13127 ece1c069ddd6 (current diff)
parent 13128 dbc546811dd6 (diff)
child 13130 f139f34ba330
Merge with stable
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())