Răsfoiți Sursa

remove python.lib.Types

frabbit 11 ani în urmă
părinte
comite
0bf640d436

+ 6 - 0
std/python/Choice.hx

@@ -0,0 +1,6 @@
+package python;
+
+abstract Choice <A,B>(Dynamic) {
+	@:from public static inline function fromA <A,B>(x:A):Choice<A,B> return cast x;
+	@:from public static inline function fromB <A,B>(x:B):Choice<A,B> return cast x;
+}

+ 0 - 2
std/python/Lib.hx

@@ -1,7 +1,5 @@
 package python;
 
-import python.lib.Types;
-
 typedef PySys = python.lib.Sys;
 typedef PyStringTools = python.lib.StringTools;
 

+ 0 - 1
std/python/_std/Reflect.hx

@@ -26,7 +26,6 @@ import python.internal.ArrayImpl;
 
 import python.lib.Builtin;
 import python.lib.Inspect;
-import python.lib.Types;
 import python.Syntax;
 import python.VarArgs;
 

+ 1 - 2
std/python/lib/Builtin.hx

@@ -3,11 +3,10 @@ package python.lib;
 
 
 import python.lib.io.IOBase;
-import python.lib.Types;
 import python.lib.Dict;
 import python.NativeIterable;
 import python.NativeIterator;
-
+import python.Choice;
 
 
 

+ 0 - 1
std/python/lib/Dict.hx

@@ -3,7 +3,6 @@ package python.lib;
 
 import python.lib.Builtin;
 import python.lib.Tuple;
-import python.lib.Types;
 import python.NativeIterator;
 import python.Syntax;
 

+ 1 - 1
std/python/lib/Glob.hx

@@ -1,7 +1,7 @@
 
 package python.lib;
 
-import python.lib.Types;
+
 import python.NativeIterator;
 
 extern class Glob {

+ 0 - 1
std/python/lib/Os.hx

@@ -4,7 +4,6 @@ package python.lib;
 
 import python.lib.Exceptions.OSError;
 import python.lib.Tuple;
-import python.lib.Types;
 
 extern class Stat {
 	public var st_mode:Int;

+ 0 - 1
std/python/lib/Re.hx

@@ -1,7 +1,6 @@
 
 package python.lib;
 
-import python.lib.Types;
 import python.lib.Tuple;
 
 

+ 1 - 1
std/python/lib/Sys.hx

@@ -5,7 +5,7 @@ import python.lib.io.FileIO;
 import python.lib.io.RawIOBase;
 import python.lib.io.TextIOBase;
 import python.lib.Tuple.Tup3;
-import python.lib.Types;
+
 
 extern class TB {}
 extern class Frame {}

+ 0 - 1
std/python/lib/Traceback.hx

@@ -2,7 +2,6 @@ package python.lib;
 
 import python.lib.Sys;
 import python.lib.Sys.Frame;
-import python.lib.Types;
 import python.lib.Tuple;
 
 

+ 0 - 35
std/python/lib/Types.hx

@@ -1,35 +0,0 @@
-
-package python.lib;
-
-
-import python.lib.Builtin;
-import python.lib.io.IOBase;
-
-abstract Choice <A,B>(Dynamic) {
-	@:from public static inline function fromA <A,B>(x:A):Choice<A,B> return cast x;
-	@:from public static inline function fromB <A,B>(x:B):Choice<A,B> return cast x;
-}
-
-
-
-
-
-
-
-
-typedef NativeHashable = {
-	public function __hash__():Int;
-}
-
-typedef NativeEqual = {
-	public function __eq__(other:Dynamic):Int;
-}
-
-typedef NativeComparable = {
-
-	public function __cmp__(other:Dynamic):Int;
-}
-
-
-
-

+ 0 - 1
std/python/lib/io/RawIOBase.hx

@@ -3,7 +3,6 @@ package python.lib.io;
 
 import python.lib.io.FileIO;
 import python.lib.io.IOBase;
-import python.lib.Types;
 
 extern class RawIOBase extends IOBase{
 

+ 0 - 1
std/python/lib/net/Socket.hx

@@ -22,7 +22,6 @@
 package python.lib.net;
 
 import haxe.io.BytesData;
-import python.lib.Types;
 import python.lib.Tuple;
 
 /**

+ 0 - 1
std/python/lib/os/Path.hx

@@ -1,7 +1,6 @@
 
 package python.lib.os;
 
-import python.lib.Types;
 import python.lib.Tuple;
 
 extern class Path {

+ 0 - 1
std/python/lib/subprocess/Popen.hx

@@ -4,7 +4,6 @@ package python.lib.subprocess;
 import python.lib.io.BufferedReader;
 import python.lib.io.TextIOBase;
 import python.lib.Subprocess.StartupInfo;
-import python.lib.Types;
 import python.lib.Tuple;
 
 typedef PopenOptions = {

+ 0 - 1
std/python/lib/xml/etree/ElementTree.hx

@@ -3,7 +3,6 @@ package python.lib.xml.etree;
 
 import python.lib.Tuple.Tup2;
 
-import python.lib.Types;
 import python.NativeIterable;
 import python.NativeIterator;
 

+ 0 - 1
tests/unit/TestPython.hx

@@ -29,7 +29,6 @@ import python.lib.Time;
 import python.lib.Traceback;
 import python.lib.Tty;
 import python.lib.Tuple;
-import python.lib.Types;
 
 import python.lib.datetime.DateTime;
 import python.lib.datetime.TimeDelta;