move Bytes and Bytearray into python package, fix #3983

genpy.ml

@@ -80,7 +80,7 @@ module KeywordHandler = struct
 		List.iter (fun s -> Hashtbl.add h s ()) [
 			"len"; "int"; "float"; "list"; "bool"; "str"; "isinstance"; "print"; "min"; "max";
 			"hasattr"; "getattr"; "setattr"; "delattr"; "callable"; "type"; "ord"; "chr"; "iter"; "map"; "filter";
-			"tuple"; "dict"; "set";
+			"tuple"; "dict"; "set"; "bytes"; "bytearray"
 		];
 		h
 

std/haxe/io/Bytes.hx

@@ -474,7 +474,7 @@ class Bytes {
 		#elseif java
 		return new Bytes(length, new java.NativeArray(length));
 		#elseif python
-		return new Bytes(length, new python.lib.Bytearray(length));
+		return new Bytes(length, new python.Bytearray(length));
 		#else
 		var a = new Array();
 		for( i in 0...length )
@@ -509,7 +509,7 @@ class Bytes {
 		catch (e:Dynamic) throw e;
 
 		#elseif python
-			var b:BytesData = new python.lib.Bytearray(s, "UTF-8");
+			var b:BytesData = new python.Bytearray(s, "UTF-8");
 			return new Bytes(b.length, b);
 
 		#else

std/haxe/io/BytesBuffer.hx

@@ -204,7 +204,7 @@ class BytesBuffer {
 		var buf = b.toByteArray();
 		var bytes = new Bytes(buf.length, buf);
 		#elseif python
-		var buf = new python.lib.Bytearray(b);
+		var buf = new python.Bytearray(b);
 		var bytes = new Bytes(buf.length, buf);
 		#elseif js
 		var bytes = new Bytes(new js.html.Uint8Array(b).buffer);

std/haxe/io/BytesData.hx

@@ -35,7 +35,7 @@ package haxe.io;
 #elseif cs
 	typedef BytesData = cs.NativeArray<cs.StdTypes.UInt8>;
 #elseif python
-	typedef BytesData = python.lib.Bytearray;
+	typedef BytesData = python.Bytearray;
 #elseif js
 	typedef BytesData = js.html.ArrayBuffer;
 #else

std/python/lib/Bytearray.hx → std/python/Bytearray.hx

@@ -19,11 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package python.lib;
+package python;
 
 import python.Syntax;
 
-@:pythonImport("builtins", "bytearray")
+@:native("bytearray")
 extern class Bytearray implements ArrayAccess<Int> {
 
 	public var length(get,never):Int;

std/python/lib/Bytes.hx → std/python/Bytes.hx

@@ -19,11 +19,11 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-package python.lib;
+package python;
 
-import python.lib.Bytearray;
+import python.Bytearray;
 
-@:pythonImport("builtins", "bytes")
+@:native("bytes")
 extern class Bytes extends Bytearray {
 
 	//public function decode(encoding:String="utf-8", errors:String="strict"):String;

std/python/NativeStringTools.hx

@@ -21,7 +21,7 @@
  */
 package python;
 
-import python.lib.Bytes;
+import python.Bytes;
 import python.Tuple;
 
 class NativeStringTools {

std/python/io/NativeBytesInput.hx

@@ -26,7 +26,7 @@ import haxe.io.Input;
 
 import python.io.IInput;
 import python.io.IoTools;
-import python.lib.Bytearray;
+import python.Bytearray;
 import python.lib.io.RawIOBase;
 import python.lib.io.IOBase.SeekSet;
 

std/python/io/NativeBytesOutput.hx

@@ -23,7 +23,7 @@ package python.io;
 
 import haxe.io.Output;
 
-import python.lib.Bytearray;
+import python.Bytearray;
 import python.lib.io.IOBase;
 import python.lib.io.RawIOBase;
 

std/python/io/NativeInput.hx

@@ -23,7 +23,7 @@ package python.io;
 
 import haxe.io.Eof;
 import haxe.io.Input;
-import python.lib.Bytearray;
+import python.Bytearray;
 import python.lib.io.IOBase;
 import python.lib.io.RawIOBase;
 

std/python/io/NativeTextInput.hx

@@ -27,7 +27,7 @@ import haxe.io.Input;
 import python.io.IInput;
 import python.io.IoTools;
 import python.io.NativeInput;
-import python.lib.Bytearray;
+import python.Bytearray;
 import python.lib.io.RawIOBase;
 import python.lib.io.IOBase.SeekSet;
 import python.lib.io.TextIOBase;

std/python/lib/Builtins.hx

@@ -101,10 +101,10 @@ extern class Builtins {
 
 	public static function type():Void;
 	/*
-	@:overload(function (it:Array<Int>):python.lib.ByteArray {})
-	@:overload(function (it:NativeIterable<Int>):python.lib.ByteArray {})
-	@:overload(function (size:Int):python.lib.ByteArray {})
-	public static function bytearray(source:String,encoding:String,?errors:Dynamic):python.lib.ByteArray;
+	@:overload(function (it:Array<Int>):python.Bytearray {})
+	@:overload(function (it:NativeIterable<Int>):python.Bytearray {})
+	@:overload(function (size:Int):python.Bytearray {})
+	public static function bytearray(source:String,encoding:String,?errors:Dynamic):python.Bytearray;
 	*/
 	public static function float(x:Dynamic):Float;
 

std/python/lib/Codecs.hx

@@ -21,7 +21,7 @@
  */
 package python.lib;
 
-import python.lib.Bytes;
+import python.Bytes;
 import python.lib.codecs.StreamReaderWriter;
 
 @:pythonImport("codecs")

std/python/lib/Msvcrt.hx

@@ -24,6 +24,6 @@ package python.lib;
 @:pythonImport("msvcrt", ignoreError=true)
 extern class Msvcrt {
 
-	public static function getch ():python.lib.Bytes;
+	public static function getch ():python.Bytes;
 
 }

std/python/lib/codecs/Codec.hx

@@ -21,7 +21,7 @@
  */
 package python.lib.codecs;
 
-import python.lib.Bytes;
+import python.Bytes;
 import python.Tuple.Tuple2;
 
 @:pythonImport("codecs", "Codec")

std/python/lib/io/BufferedIOBase.hx

@@ -24,7 +24,7 @@ package python.lib.io;
 import python.lib.io.IOBase;
 
 import python.lib.io.RawIOBase;
-import python.lib.Bytearray;
+import python.Bytearray;
 
 @:pythonImport("io", "BufferedIOBase")
 extern class BufferedIOBase extends IOBase implements IBufferedIOBase {

std/python/lib/io/BufferedReader.hx

@@ -21,7 +21,7 @@
  */
 package python.lib.io;
 
-import python.lib.Bytes;
+import python.Bytes;
 import python.lib.io.BufferedIOBase;
 
 @:pythonImport("io", "BufferedReader")

std/python/lib/io/BufferedWriter.hx

@@ -21,7 +21,7 @@
  */
 package python.lib.io;
 
-import python.lib.Bytearray;
+import python.Bytearray;
 import python.lib.io.BufferedIOBase;
 
 @:pythonImport("io", "BufferedWriter")