Merge remote-tracking branch 'origin/master' into baserock/morphbaserock/morph

This changes us to 1.9.3 which might stand a better chance of being
usable by Lorry.

We also undo the setup.py change because python now supports bz2

1 files changed, 1 insertions, 5 deletions

diff --git a/tests/dummyssh b/tests/dummyssh
index 9b1430a..fc498b4 100755
--- a/tests/dummyssh
+++ b/tests/dummyssh
@@ -16,9 +16,5 @@ for i, arg in enumerate(sys.argv[1:]):
     log.write(" %d:%s" % (i+1, arg))
 log.write("\n")
 log.close()
-hgcmd = sys.argv[2]
-if os.name == 'nt':
-    # hack to make simple unix single quote quoting work on windows
-    hgcmd = hgcmd.replace("'", '"')
-r = os.system(hgcmd)
+r = os.system(sys.argv[2])
 sys.exit(bool(r))