From patchwork Fri Sep 13 20:46:51 2013
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: plan9: update util.py for cpython 2.7 build
From: jas@corpus-callosum.com
X-Patchwork-Id: 2444
Message-Id: <9fd088ed9cf59542387d.1379105211@acme.buf.io>
To: mercurial-devel@selenic.com
Cc: jas@buf.io
Date: Fri, 13 Sep 2013 15:46:51 -0500

# HG changeset patch
# User Jeff Sickel <jas@corpus-callosum.com>
# Date 1379104804 18000
#      Fri Sep 13 15:40:04 2013 -0500
# Node ID 9fd088ed9cf59542387d09fac002d5ffc1ab0e74
# Parent  3de0893bdd5e12e91169bb820e49ead77940b877
plan9: update util.py for cpython 2.7 build

diff -r 3de0893bdd5e -r 9fd088ed9cf5 mercurial/util.py
--- a/mercurial/util.py	Mon Aug 12 17:48:27 2013 -0500
+++ b/mercurial/util.py	Fri Sep 13 15:40:04 2013 -0500
@@ -465,7 +465,7 @@
         return str(val)
     origcmd = cmd
     cmd = quotecommand(cmd)
-    if sys.platform == 'plan9':
+    if sys.platform == 'plan9' and (sys.version_info[0] == 2 and sys.version_info[1] < 7):
         # subprocess kludge to work around issues in half-baked Python
         # ports, notably bichued/python:
         if not cwd is None: