[pypy-commit] pypy default: fix whatsnew, fix test for windows (with modified command.py to allow test to run)

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r88167:f826843099a7
Date: 2016-11-07 14:07 +0200
http://bitbucket.org/pypy/pypy/changeset/f826843099a7/

Log:	fix whatsnew, fix test for windows (with modified command.py to
	allow test to run)

diff --git a/pypy/doc/test/test_whatsnew.py b/pypy/doc/test/test_whatsnew.py
--- a/pypy/doc/test/test_whatsnew.py
+++ b/pypy/doc/test/test_whatsnew.py
@@ -110,4 +110,4 @@
         "hg log -r %s --template '{branch}'" % startrev)
     if errcode != 0:
         py.test.skip('no Mercurial repo')
-    assert wc_branch == 'default'
+    assert wc_branch in ('default', "'default'") # sometimes the ' leaks (windows)
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -100,3 +100,8 @@
 .. branch: newinitwarn
 
 Match CPython's stricter handling of __new/init__ arguments
+
+.. branch: openssl-1.1
+
+Support for OpenSSL version 1.1 (in addition to version 1.0).
+Tested on Linux (1.1, 1.0), on Win32, and Mac (1.0 only)