Misc changes (#1397)

* Allow cast of empty memoryview

* Use IBufferProtocol in some _socket methods

* Add sys._platform_version

* Misc _ssl changes

* Mark test_zlib as NotParallelSafe

* Avoid intermittent StackOverflow

* Fix comment

* Allow None when setting __annotations__

Author: slozier

Src/IronPython.Modules/_socket.cs

@@ -498,7 +498,7 @@ public PythonTuple recvfrom(int bufsize, int flags = 0) {
             }
 
             [Documentation("recvfrom_into(buffer[, nbytes[, flags]]) -> (nbytes, address info)\n\n"
-                +"Like recv_into(buffer[, nbytes[, flags]]) but also return the sender's address info.\n"
+                + "Like recv_into(buffer[, nbytes[, flags]]) but also return the sender's address info.\n"
                 )]
             public PythonTuple recvfrom_into([NotNull] IBufferProtocol buffer, int nbytes = 0, int flags = 0) {
                 using var buf = buffer.GetBufferNoThrow(BufferFlags.Writable);
@@ -1480,18 +1480,23 @@ public static Bytes inet_pton(CodeContext/*!*/ context, int addressFamily, [NotN
             + "\n"
             + "inet_ntop() supports IPv4 and IPv6."
             )]
-        public static string inet_ntop(CodeContext/*!*/ context, int addressFamily, [NotNull] Bytes packedIP) {
+        public static string inet_ntop(CodeContext/*!*/ context, int addressFamily, [NotNull] IBufferProtocol packedIP) {
+            using var buffer = packedIP.GetBuffer();
+            var span = buffer.AsReadOnlySpan();
             if (!(
-                (packedIP.Count == IPv4AddrBytes && addressFamily == (int)AddressFamily.InterNetwork)
-                || (packedIP.Count == IPv6AddrBytes && addressFamily == (int)AddressFamily.InterNetworkV6)
+                (span.Length == IPv4AddrBytes && addressFamily == (int)AddressFamily.InterNetwork)
+                || (span.Length == IPv6AddrBytes && addressFamily == (int)AddressFamily.InterNetworkV6)
             )) {
                 throw PythonOps.ValueError("invalid length of packed IP address string");
             }
-            byte[] ipBytes = packedIP.UnsafeByteArray;
             if (addressFamily == (int)AddressFamily.InterNetworkV6) {
-                return IPv6BytesToColonHex(ipBytes);
+                return IPv6BytesToColonHex(span);
             }
-            return (new IPAddress(ipBytes)).ToString();
+#if NETCOREAPP
+            return new IPAddress(span).ToString();
+#else
+            return new IPAddress(buffer.AsUnsafeArray() ?? buffer.ToArray()).ToString();
+#endif
         }
 
         [Documentation("inet_aton(ip_string) -> packed_ip\n"
@@ -1517,7 +1522,7 @@ public static Bytes inet_aton(CodeContext/*!*/ context, [NotNull] string ipStrin
             + "\n"
             + "inet_ntoa() supports only IPv4."
             )]
-        public static string inet_ntoa(CodeContext/*!*/ context, [NotNull] Bytes packedIP) {
+        public static string inet_ntoa(CodeContext/*!*/ context, [NotNull] IBufferProtocol packedIP) {
             return inet_ntop(context, (int)AddressFamily.InterNetwork, packedIP);
         }
 
@@ -1731,7 +1736,7 @@ internal static Exception MakeException(CodeContext/*!*/ context, Exception exce
         /// which differs from the normal Python implementation (but is allowed by the IETF);
         /// this method returns the standard (no dotted-quad) colon-hex form.
         /// </summary>
-        private static string IPv6BytesToColonHex(byte[] ipBytes) {
+        private static string IPv6BytesToColonHex(ReadOnlySpan<byte> ipBytes) {
             Debug.Assert(ipBytes.Length == IPv6AddrBytes);
 
             const int bytesPerWord = 2; // in bytes

Src/IronPython.Modules/_ssl.cs

@@ -135,7 +135,15 @@ public _SSLContext(CodeContext context, int protocol) {
             }
 
             public void set_ciphers(CodeContext context, string ciphers) {
+                // TODO
+            }
+
+            public void _set_alpn_protocols(CodeContext context, IBufferProtocol protos) {
+                // TODO
+            }
 
+            public void _set_npn_protocols(CodeContext context, IBufferProtocol protos) {
+                // TODO
             }
 
             public int options {
@@ -270,23 +278,28 @@ public class _SSLSocket {
             private SslStream _sslStream;
             private readonly PythonSocket.socket _socket;
             private readonly X509Certificate2Collection _certCollection;
-            private readonly int _protocol, _certsMode;
+            private readonly int _certsMode;
             private readonly bool _validate, _serverSide;
             private readonly CodeContext _context;
             private readonly RemoteCertificateValidationCallback _callback;
             private Exception _validationFailure;
-            internal string _serverHostName;
 
             public _SSLContext context { get; }
 
+            public object owner { get; set; } // TODO
+
+            public string server_hostname { get; }
+
+            public string version() => ProtocolToPython();
+
             internal _SSLSocket(CodeContext context, _SSLContext sslcontext, PythonSocket.socket sock, bool server_side, string server_hostname) {
                 if (sock == null) {
                     throw PythonOps.TypeError("expected socket object, got None");
                 }
 
                 this.context = sslcontext;
                 _serverSide = server_side;
-                _serverHostName = server_hostname;
+                this.server_hostname = server_hostname;
 
                 _certsMode = sslcontext.verify_mode;
 
@@ -319,7 +332,6 @@ internal _SSLSocket(CodeContext context, _SSLContext sslcontext, PythonSocket.so
 
                 EnsureSslStream(false);
 
-                _protocol = sslcontext.protocol | sslcontext.options;
                 _validate = validate;
                 _context = context;
             }
@@ -429,7 +441,7 @@ public void do_handshake() {
 
                 EnsureSslStream(true);
 
-                var enabledSslProtocols = GetProtocolType(_protocol);
+                var enabledSslProtocols = GetProtocolType(context.protocol, context.options);
 
                 try {
                     if (_serverSide) {
@@ -439,7 +451,7 @@ public void do_handshake() {
                         }
                         _sslStream.AuthenticateAsServer(_cert, _certsMode == PythonSsl.CERT_REQUIRED, enabledSslProtocols, false);
                     } else {
-                        _sslStream.AuthenticateAsClient(_serverHostName ?? _socket._hostName, context._cert_store, enabledSslProtocols, false);
+                        _sslStream.AuthenticateAsClient(server_hostname ?? _socket._hostName, context._cert_store, enabledSslProtocols, false);
                     }
                 } catch (AuthenticationException e) {
                     ((IDisposable)_socket._socket).Dispose();
@@ -467,10 +479,10 @@ TLSv1.1    no    no    yes    no     yes      no
                        TLSv1.2    no    no    yes    no      no     yes
              */
 
-            private static SslProtocols GetProtocolType(int type) {
+            private static SslProtocols GetProtocolType(int protocol, int options) {
                 SslProtocols result = SslProtocols.None;
 
-                switch (type & ~PythonSsl.OP_NO_ALL) {
+                switch (protocol) {
 #pragma warning disable CA5397 // Do not use deprecated SslProtocols values
 #pragma warning disable CS0618 // Type or member is obsolete
                     case PythonSsl.PROTOCOL_SSLv2:
@@ -494,17 +506,17 @@ private static SslProtocols GetProtocolType(int type) {
                         result = SslProtocols.Tls12;
                         break;
                     default:
-                        throw new InvalidOperationException("bad ssl protocol type: " + type);
+                        throw new InvalidOperationException("bad ssl protocol type: " + protocol);
                 }
                 // Filter out requested protocol exclusions:
 #pragma warning disable CA5397 // Do not use deprecated SslProtocols values
 #pragma warning disable CS0618 // Type or member is obsolete
-                result &= (type & PythonSsl.OP_NO_SSLv3) != 0 ? ~SslProtocols.Ssl3 : ~SslProtocols.None;
-                result &= (type & PythonSsl.OP_NO_SSLv2) != 0 ? ~SslProtocols.Ssl2 : ~SslProtocols.None;
+                result &= (options & PythonSsl.OP_NO_SSLv3) != 0 ? ~SslProtocols.Ssl3 : ~SslProtocols.None;
+                result &= (options & PythonSsl.OP_NO_SSLv2) != 0 ? ~SslProtocols.Ssl2 : ~SslProtocols.None;
 #pragma warning restore CS0618 // Type or member is obsolete
-                result &= (type & PythonSsl.OP_NO_TLSv1) != 0 ? ~SslProtocols.Tls : ~SslProtocols.None;
-                result &= (type & PythonSsl.OP_NO_TLSv1_1) != 0 ? ~SslProtocols.Tls11 : ~SslProtocols.None;
-                result &= (type & PythonSsl.OP_NO_TLSv1_2) != 0 ? ~SslProtocols.Tls12 : ~SslProtocols.None;
+                result &= (options & PythonSsl.OP_NO_TLSv1) != 0 ? ~SslProtocols.Tls : ~SslProtocols.None;
+                result &= (options & PythonSsl.OP_NO_TLSv1_1) != 0 ? ~SslProtocols.Tls11 : ~SslProtocols.None;
+                result &= (options & PythonSsl.OP_NO_TLSv1_2) != 0 ? ~SslProtocols.Tls12 : ~SslProtocols.None;
 #pragma warning restore CA5397 // Do not use deprecated SslProtocols values
                 return result;
             }
@@ -1179,6 +1191,7 @@ private static Exception ErrorDecoding(CodeContext context, params object[] args
         private const int PROTOCOL_SSLv2 = 0;
         private const int PROTOCOL_SSLv3 = 1;
         public const int PROTOCOL_SSLv23 = 2;
+        public const int PROTOCOL_TLS = 2;
         public const int PROTOCOL_TLSv1 = 3;
         public const int PROTOCOL_TLSv1_1 = 4;
         public const int PROTOCOL_TLSv1_2 = 5;

Src/IronPython/Modules/sys.cs

@@ -256,6 +256,8 @@ private windows_version(int major, int minor, int build, int platform, string se
             public readonly int suite_mask;
             public readonly PythonTuple platform_version;
 
+            public PythonTuple _platform_version => platform_version; // TODO: remove in 3.6 (for compat with 3.5)
+
             public const int n_fields = 10;
             public const int n_sequence_fields = 5;
             public const int n_unnamed_fields = 0;

Src/IronPython/Runtime/MemoryView.cs

@@ -455,7 +455,7 @@ public MemoryView cast([NotNull]string format, [NotNull, AllowNull]object shape)
                 throw PythonOps.TypeError("memoryview: casts are restricted to C-contiguous views");
             }
 
-            if (_shape.Contains(0) || _strides.Contains(0)) {
+            if ((shape != null || _numDims != 1) && (_shape.Contains(0) || _strides.Contains(0))) {
                 throw PythonOps.TypeError("memoryview: cannot cast view with zeros in shape or strides");
             }
 

Src/IronPython/Runtime/PythonFunction.cs

@@ -123,7 +123,7 @@ public PythonDictionary __annotations__ {
                 return _annotations;
             }
             set {
-                _annotations = value ?? throw PythonOps.TypeError("__annotations__ must be set to a dict object");
+                _annotations = value ?? new PythonDictionary();
             }
         }
 

Src/IronPythonTest/Cases/IronPythonCasesManifest.ini

@@ -145,6 +145,9 @@ IsolationLevel=PROCESS # causes failures in IronPython.test_ast and IronPython.s
 [IronPython.modules.misc.test__weakref]
 RetryCount=2
 
+[IronPython.modules.misc.test_zlib]
+NotParallelSafe=true # test_data.gz
+
 [IronPython.modules.system_related.test_nt]
 RunCondition=NOT $(IS_POSIX)
 NotParallelSafe=true # Uses fixed file, directory, and environment variable names

Tests/IndicesTest.py

@@ -2,7 +2,7 @@
 # The .NET Foundation licenses this file to you under the Apache 2.0 License.
 # See the LICENSE file in the project root for more information.
 
-# generated by IndicesTest.py
+# generated by generate_indicestest.py
 
 def test_indices(self):
     def t(i, j, k, l, r):

Tests/test_int.py

@@ -50,12 +50,12 @@ def test_to_bytes_clrint(self):
                             continue
                         for length in range(0, 10):
                             try:
-                                expeced = big(v).to_bytes(length, byteorder, signed)
+                                expected = big(v).to_bytes(length, byteorder, signed)
                             except OverflowError:
-                                continue # length too short
-
-                            actual = t(v).to_bytes(length, byteorder, signed)
-                            self.assertEqual(actual, expeced)
+                                pass # length too short
+                            else:
+                                actual = t(v).to_bytes(length, byteorder, signed)
+                                self.assertEqual(actual, expected)
 
     def test_int(self):
         class MyTrunc:

Tests/test_memoryview.py

@@ -454,7 +454,7 @@ def __bytes__(self):
 
         self.assertEqual(mvc[1], b"a")
 
-    @unittest.skipUnless(is_64, "asssumes 64-bit pointers")
+    @unittest.skipUnless(is_64, "assumes 64-bit pointers")
     def test_cast_pointer(self):
         ba = bytearray(range(16))
         mv = memoryview(ba)
@@ -478,7 +478,7 @@ def test_cast_pointer(self):
         with self.assertRaises(ValueError):
             mvp[0] = -0x8000000000000001
 
-    @unittest.skipUnless(is_64 and is_cli, "CLI interop, asssumes 64-bit pointers")
+    @unittest.skipUnless(is_64 and is_cli, "CLI interop, assumes 64-bit pointers")
     def test_cast_netpointer(self):
         import System
         ba = bytearray(range(16))
@@ -564,5 +564,10 @@ def test_cast_reshape_then_slice(self):
         self.assertEqual(mv_2.tolist(), [[[0, 1], [2, 3]], [[8, 9], [10, 11]]])
         self.assertEqual(mv_2.tobytes(), b'\x00\x01\x02\x03\x08\x09\x0a\x0b')
 
+    def test_cast_empty(self):
+        memoryview(b'').cast('b')
+        memoryview(bytearray(b'')).cast('b')
+        self.assertRaises(TypeError, memoryview(b'').cast, 'b', object()) # fails with any 2nd argument
+
 
 run_test(__name__)