[pypy-commit] pypy py3.6: fix merge

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.6
Changeset: r96693:f91bbed46ef7
Date: 2019-05-27 07:37 +0300
http://bitbucket.org/pypy/pypy/changeset/f91bbed46ef7/

Log:	fix merge

diff --git a/lib_pypy/_cffi_ssl/_stdssl/win32_extra.py b/lib_pypy/_cffi_ssl/_stdssl/win32_extra.py
--- a/lib_pypy/_cffi_ssl/_stdssl/win32_extra.py
+++ b/lib_pypy/_cffi_ssl/_stdssl/win32_extra.py
@@ -12,10 +12,10 @@
     """
     hStore = lib.CertOpenStore(lib.CERT_STORE_PROV_SYSTEM_A, 0, ffi.NULL,
                                lib.CERT_STORE_READONLY_FLAG | lib.CERT_SYSTEM_STORE_LOCAL_MACHINE,
-                               bytes(store_name))
+                               bytes(store_name, "ascii"))
     if hStore == ffi.NULL:
         raise WindowsError(*ffi.getwinerror())
-
+    
     result = []
     pCertCtx = ffi.NULL
     try:
@@ -47,7 +47,7 @@
 X509_ASN_ENCODING or PKCS_7_ASN_ENCODING."""
     hStore = lib.CertOpenStore(lib.CERT_STORE_PROV_SYSTEM_A, 0, ffi.NULL,
                                lib.CERT_STORE_READONLY_FLAG | lib.CERT_SYSTEM_STORE_LOCAL_MACHINE,
-                               bytes(store_name))
+                               bytes(store_name, "ascii"))
     if hStore == ffi.NULL:
         raise WindowsError(*ffi.getwinerror())