Normalize access of Bytes/ByteArray backing field (#693)

* Use GetUnsafeByteArray accessor

* Change GetUnsafeByteArray to an UnsafeByteArray property

* Add ByteArray.UnsafeByteList accessor

* Fix test failure

* Update test__socket assertions

* Use Bytes.Make

* Update error message

Author: slozier

Src/IronPython.Modules/ModuleOps.cs

@@ -5,6 +5,7 @@
 #if FEATURE_CTYPES
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Numerics;
 using System.Runtime.InteropServices;
@@ -153,18 +154,18 @@ public static CTypes._Array TryCheckCharArray(object o) {
 
         public static byte[] TryCheckBytes(object o) {
             if (o is Bytes bytes) {
-                if (bytes._bytes.Length == 0) {
+                if (bytes.Count == 0) {
                     // OpCodes.Ldelema refuses to get address of empty array
                     // So we feed it with a fake one (cp34892)
                     return FakeZeroLength;
                 }
-                return bytes._bytes;
+                return bytes.UnsafeByteArray;
             }
             return null;
         }
 
         public static byte[] GetBytes(Bytes bytes) {
-            return bytes._bytes;
+            return bytes.UnsafeByteArray;
         }
 
         public static CTypes._Array TryCheckWCharArray(object o) {
@@ -600,7 +601,7 @@ public static byte GetChar(object value, object type) {
             }
 
             if(value is Bytes bytesVal && bytesVal.Count == 1) {
-                return bytesVal._bytes[0];
+                return ((IList<byte>)bytesVal)[0];
             }
 
             if (PythonOps.TryGetBoundAttr(value, "_as_parameter_", out object asParam)) {
@@ -632,4 +633,4 @@ public static object IntPtrToObject(IntPtr address) {
 
     }
 }
-#endif
+#endif

Src/IronPython.Modules/_ctypes/ArrayType.cs

@@ -131,7 +131,7 @@ public _Array from_buffer_copy(CodeContext/*!*/ context, Bytes array, [DefaultPa
                 _Array res = (_Array)CreateInstance(context);
                 res._memHolder = new MemoryHolder(((INativeType)this).Size);
                 for (int i = 0; i < ((INativeType)this).Size; i++) {
-                    res._memHolder.WriteByte(i, array._bytes[i]);
+                    res._memHolder.WriteByte(i, ((IList<byte>)array)[i]);
                 }
                 return res;
             }

Src/IronPython.Modules/_ctypes/CData.cs

@@ -96,7 +96,7 @@ internal virtual PythonTuple GetBufferInfo() {
             #region IBufferProtocol Members
 
             object IBufferProtocol.GetItem(int index) {
-                return new Bytes(GetBytes(index, NativeType.Size));
+                return Bytes.Make(GetBytes(index, NativeType.Size));
             }
 
             void IBufferProtocol.SetItem(int index, object value) {
@@ -145,7 +145,7 @@ PythonTuple IBufferProtocol.SubOffsets {
             }
 
             Bytes IBufferProtocol.ToBytes(int start, int? end) {
-                return new Bytes(GetBytes(start, NativeType.Size));
+                return Bytes.Make(GetBytes(start, NativeType.Size));
             }
 
             PythonList IBufferProtocol.ToList(int start, int? end) {

Src/IronPython.Modules/_datetime.cs

@@ -724,7 +724,7 @@ public datetime(int year,
             }
 
             public datetime([NotNull]Bytes bytes) {
-                var byteArray = bytes._bytes;
+                var byteArray = bytes.UnsafeByteArray;
                 if (byteArray.Length != 10) {
                     throw PythonOps.TypeError("an integer is required");
                 }

Src/IronPython.Modules/_socket.cs

@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Net.Security;
@@ -471,7 +472,7 @@ public int recv_into(ByteArray buffer, int nbytes=0, int flags=0) {
                 )]
             public int recv_into(MemoryView buffer, int nbytes=0, int flags=0) {
                 int bytesRead;
-                byte[] byteBuffer = buffer.tobytes().ToByteArray();
+                byte[] byteBuffer = buffer.tobytes().ToArray();
                 try {
                     bytesRead = _socket.Receive(byteBuffer, (SocketFlags)flags);
                 }
@@ -556,7 +557,7 @@ public PythonTuple recvfrom_into(PythonArray buffer, int nbytes=0, int flags=0)
             public PythonTuple recvfrom_into(MemoryView buffer, int nbytes=0, int flags=0){
 
                 int bytesRead;
-                byte[] byteBuffer = buffer.tobytes().ToByteArray();
+                byte[] byteBuffer = buffer.tobytes().ToArray();
                 IPEndPoint remoteIPEP = new IPEndPoint(IPAddress.Any, 0);
                 EndPoint remoteEP = remoteIPEP;
 
@@ -636,7 +637,7 @@ private Exception MakeRecvException(Exception e, SocketError errorCode=SocketErr
                 + "had room to buffer your data for a network send"
                 )]
             public int send(Bytes data, int flags=0) {
-                byte[] buffer = data.GetUnsafeByteArray();
+                byte[] buffer = data.UnsafeByteArray;
                 try {
                     return _socket.Send(buffer, (SocketFlags)flags);
                 } catch (Exception e) {
@@ -693,11 +694,11 @@ public void sendall(string data, int flags=0) {
                 + "had room to buffer your data for a network send"
                 )]
             public void sendall(Bytes data, int flags=0) {
-                sendallWorker(data.GetUnsafeByteArray(), flags);
+                sendallWorker(data.UnsafeByteArray, flags);
             }
 
             public void sendall(MemoryView data, int flags = 0) {
-                sendallWorker(data.tobytes().GetUnsafeByteArray(), flags);
+                sendallWorker(data.tobytes().UnsafeByteArray, flags);
             }
 
             private void sendallWorker(byte[] buffer, int flags) {
@@ -757,7 +758,7 @@ public int sendto(string data, int flags, PythonTuple address) {
                 + "had room to buffer your data for a network send"
                 )]
             public int sendto(Bytes data, int flags, PythonTuple address) {
-                byte[] buffer = data.GetUnsafeByteArray();
+                byte[] buffer = data.UnsafeByteArray;
                 EndPoint remoteEP = TupleToEndPoint(_context, address, _socket.AddressFamily, out _hostName);
                 try {
                     return _socket.SendTo(buffer, (SocketFlags)flags, remoteEP);
@@ -1659,7 +1660,7 @@ public static string inet_ntop(CodeContext/*!*/ context, int addressFamily, Byte
             )) {
                 throw PythonOps.ValueError("invalid length of packed IP address string");
             }
-            byte[] ipBytes = packedIP.GetUnsafeByteArray();
+            byte[] ipBytes = packedIP.UnsafeByteArray;
             if (addressFamily == (int)AddressFamily.InterNetworkV6) {
                 return IPv6BytesToColonHex(ipBytes);
             }
@@ -2516,7 +2517,7 @@ Writes the string s into the SSL object.  Returns the number
             public int write(CodeContext/*!*/ context, Bytes data) {
                 EnsureSslStream(true);
 
-                byte[] buffer = data.GetUnsafeByteArray();
+                byte[] buffer = data.UnsafeByteArray;
                 try {
                     _sslStream.Write(buffer);
                     return buffer.Length;

Src/IronPython.Modules/_ssl.cs

@@ -184,7 +184,7 @@ public void load_verify_locations(CodeContext context, [DefaultParameterValue(nu
                     var cabuf = cadata as IBufferProtocol;
                     if (cabuf != null) {
                         int pos = 0;
-                        byte[] contents = cabuf.ToBytes(0, null).ToByteArray();
+                        byte[] contents = cabuf.ToBytes(0, null).ToArray();
                         while(pos < contents.Length) {
                             byte[] curr = new byte[contents.Length - pos];
                             Array.Copy(contents, pos, curr, 0, contents.Length - pos);

Src/IronPython.Modules/_struct.cs

@@ -194,7 +194,7 @@ public void pack_into(CodeContext/*!*/ context, [NotNull]ArrayModule.array/*!*/
                     throw Error(context, $"pack_into requires a buffer of at least {size} bytes");
                 }
 
-                var data = pack(context, args).GetUnsafeByteArray();
+                var data = pack(context, args).UnsafeByteArray;
 
                 for (int i = 0; i < data.Length; i++) {
                     existing[i + offset] = data[i];
@@ -205,13 +205,13 @@ public void pack_into(CodeContext/*!*/ context, [NotNull]ArrayModule.array/*!*/
             }
 
             public void pack_into(CodeContext/*!*/ context, [NotNull]ByteArray/*!*/ buffer, int offset, params object[] args) {
-                IList<byte> existing = buffer._bytes;
+                IList<byte> existing = buffer.UnsafeByteList;
 
                 if (offset + size > existing.Count) {
                     throw Error(context, $"pack_into requires a buffer of at least {size} bytes");
                 }
 
-                var data = pack(context, args).GetUnsafeByteArray();
+                var data = pack(context, args).UnsafeByteArray;
 
                 for (int i = 0; i < data.Length; i++) {
                     existing[i + offset] = data[i];

Src/IronPython.Modules/bz2/BZ2Compressor.cs

@@ -52,7 +52,7 @@ public Bytes compress([BytesConversion]IList<byte> data) {
 
                 this.bz2Output.Write(bytes, 0, bytes.Length);
 
-                return new Bytes(this.GetLatestData());
+                return Bytes.Make(this.GetLatestData());
             }
 
             [Documentation(@"flush() -> string
@@ -63,7 +63,7 @@ You must not use the compressor object after calling this method.
             public Bytes flush() {
                 this.bz2Output.Close();
 
-                return new Bytes(this.GetLatestData());
+                return Bytes.Make(this.GetLatestData());
             }
 
             /// <summary>

Src/IronPython.Modules/bz2/BZ2Decompressor.cs

@@ -40,7 +40,7 @@ public Bytes unused_data {
 
                     Array.Copy(buffer, this.lastSuccessfulPosition, unused, 0, unusedCount);
 
-                    return new Bytes(unused);
+                    return Bytes.Make(unused);
                 }
             }
 

Src/IronPython.Modules/bz2/BZ2Module.cs

@@ -29,7 +29,7 @@ private static byte[] ToArrayNoCopy(this IList<byte> bytes) {
 
             Bytes bytesP = bytes as Bytes;
             if (bytesP != null) {
-                return bytesP.GetUnsafeByteArray();
+                return bytesP.UnsafeByteArray;
             }
 
             return bytes.ToArray();