frabbit 11 years ago
parent
commit
34edde33d0

+ 3 - 3
std/python/Lib.hx

@@ -1,6 +1,6 @@
 package python;
 
-import python.lib.NativeStrings;
+import python.NativeStringTools;
 
 typedef PySys = python.lib.Sys;
 
@@ -9,14 +9,14 @@ class Lib {
 	public static function print(v:Dynamic):Void {
 		var str = Std.string(v);
 
-		PySys.stdout.buffer.write( NativeStrings.encode(str, "utf-8"));
+		PySys.stdout.buffer.write( NativeStringTools.encode(str, "utf-8"));
 		PySys.stdout.flush();
 	}
 
 	public static function println(v:Dynamic):Void {
 		var str = Std.string(v);
 
-		PySys.stdout.buffer.write( NativeStrings.encode('$str\n', "utf-8"));
+		PySys.stdout.buffer.write( NativeStringTools.encode('$str\n', "utf-8"));
 		PySys.stdout.flush();
 	}
 

+ 3 - 5
std/python/lib/ArrayTools.hx → std/python/NativeArrayTools.hx

@@ -1,7 +1,6 @@
+package python;
 
-package python.lib;
-
-class ArrayTools {
+class NativeArrayTools {
 
 	public static inline function extend <T>(a:Array<T>, x:Array<T>):Void {
 		python.Syntax.field(a, "extend")(x);
@@ -11,8 +10,7 @@ class ArrayTools {
 		python.Syntax.field(a, "append")(x);
 	}
 
-	public static inline function contains <T>(a:Array<T>, x:T):Bool
-	{
+	public static inline function contains <T>(a:Array<T>, x:T):Bool {
 		return python.Syntax.isIn(x,a);
 	}
 

+ 2 - 2
std/python/lib/NativeStrings.hx → std/python/NativeStringTools.hx

@@ -1,10 +1,10 @@
 
-package python.lib;
+package python;
 
 import python.lib.Bytes;
 import python.lib.Tuple;
 
-class NativeStrings {
+class NativeStringTools {
 
 	public static function format (s:String, args:Array<Dynamic>):String
 	{

+ 0 - 18
std/python/lib/NativeLists.hx

@@ -1,18 +0,0 @@
-package python.lib;
-
-class NativeLists {
-
-	public static inline function extend <T>(a:Array<T>, x:Array<T>):Void {
-		python.Syntax.field(a, "extend")(x);
-	}
-
-	public static inline function append <T>(a:Array<T>, x:T):Void {
-		python.Syntax.field(a, "append")(x);
-	}
-
-	public static inline function contains <T>(a:Array<T>, x:T):Bool
-	{
-		return python.Syntax.isIn(x,a);
-	}
-
-}

+ 5 - 3
tests/unit/TestPython.hx

@@ -5,14 +5,16 @@ import python.VarArgs;
 import sys.io.File;
 import sys.io.Process;
 
-// check compilation of libs
+// check compilation python classes
+import python.NativeArrayTools;
+import python.NativeStringTools;
+
 import python.lib.Codecs;
 import python.lib.FuncTools;
 import python.lib.Glob;
 import python.lib.Inspect;
 import python.lib.Json;
-import python.lib.NativeLists;
-import python.lib.NativeStrings;
+
 import python.lib.Math;
 import python.lib.Msvcrt;
 import python.lib.Os;