Przeglądaj źródła

[python] rename modules, follow same convention than nodejs target for module -> class mapping

frabbit 10 lat temu
rodzic
commit
2a3b66e186

+ 11 - 11
std/python/_std/Date.hx

@@ -19,21 +19,21 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
-import python.lib.datetime.DateTime;
-import python.lib.datetime.TimeDelta;
+import python.lib.datetime.Datetime;
+import python.lib.datetime.Timedelta;
 import python.Syntax;
 
 @:coreApi class Date
 {
-	static var EPOCH = DateTime.fromtimestamp(0, python.lib.datetime.Timezone.utc);
+	static var EPOCH = Datetime.fromtimestamp(0, python.lib.datetime.Timezone.utc);
 
-	private var date:DateTime;
+	private var date:Datetime;
 
 	public function new(year : Int, month : Int, day : Int, hour : Int, min : Int, sec : Int ) : Void
 	{
-		if (year < DateTime.min.year) year = DateTime.min.year;
+		if (year < Datetime.min.year) year = Datetime.min.year;
 		if (day == 0) day = 1;
-		date = new DateTime(year, month+1, day, hour, min, sec, 0, python.lib.datetime.Timezone.utc);
+		date = new Datetime(year, month+1, day, hour, min, sec, 0, python.lib.datetime.Timezone.utc);
 	}
 
 	public inline function getTime() : Float
@@ -96,25 +96,25 @@ import python.Syntax;
 	static public function now() : Date
 	{
 		var d = new Date(1970, 0, 1, 0, 0, 0);
-		d.date = DateTime.now(python.lib.datetime.Timezone.utc);
+		d.date = Datetime.now(python.lib.datetime.Timezone.utc);
 		return d;
 	}
 
 	static public function fromTime( t : Float ) : Date
 	{
 		var d = new Date(1970, 0, 1, 0, 0, 0);
-		d.date = DateTime.fromtimestamp(t / 1000.0, python.lib.datetime.Timezone.utc);
+		d.date = Datetime.fromtimestamp(t / 1000.0, python.lib.datetime.Timezone.utc);
 		return d;
 	}
 
 	static function UTC( year : Int, month : Int, day : Int, hour : Int, min : Int, sec : Int ) : Float
 	{
-		var dt = new DateTime(year, month+1, day, hour, min, sec, 0, python.lib.datetime.Timezone.utc);
+		var dt = new Datetime(year, month+1, day, hour, min, sec, 0, python.lib.datetime.Timezone.utc);
 		return datetimeTimestamp(dt);
 	}
 
-	static function datetimeTimestamp(dt:DateTime):Float {
-		return (Syntax.binop(dt, "-", EPOCH) : TimeDelta).total_seconds() * 1000;
+	static function datetimeTimestamp(dt:Datetime):Float {
+		return (Syntax.binop(dt, "-", EPOCH) : Timedelta).total_seconds() * 1000;
 	}
 
 	static public function fromString( s : String ) : Date

+ 1 - 1
std/python/_std/sys/io/File.hx

@@ -84,6 +84,6 @@ class File {
 
 	public static function copy( srcPath : String, dstPath : String ) : Void
 	{
-		return python.lib.ShUtil.copy(srcPath, dstPath);
+		return python.lib.Shutil.copy(srcPath, dstPath);
 	}
 }

+ 2 - 2
std/python/internal/ArrayImpl.hx

@@ -22,7 +22,7 @@
 
 package python.internal;
 
-import python.lib.FuncTools;
+import python.lib.Functools;
 import python.lib.Builtin;
 
 @:allow(Array)
@@ -110,7 +110,7 @@ class ArrayImpl {
 	}
 
 	public static inline function sort<T>(x:Array<T>, f:T->T->Int) : Void {
-		Syntax.callNamedUntyped(Syntax.field(x, "sort"), { key : python.lib.FuncTools.cmp_to_key(f) });
+		Syntax.callNamedUntyped(Syntax.field(x, "sort"), { key : Functools.cmp_to_key(f) });
 	}
 
 	public static inline function splice<T>(x:Array<T>, pos : Int, len : Int ) : Array<T> {

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

@@ -3,6 +3,7 @@ package python.lib;
 import python.lib.Builtin;
 import python.Syntax;
 
+@:pythonImport("builtins", "bytearray")
 extern class ByteArray implements ArrayAccess<Int> {
 	public var length(get, null):Int;
 	public inline function get_length ():Int {

+ 1 - 1
std/python/lib/FuncTools.hx → std/python/lib/Functools.hx

@@ -3,7 +3,7 @@ package python.lib;
 
 
 @:pythonImport("functools")
-extern class FuncTools {
+extern class Functools {
 
 	public static function cmp_to_key<A>(f:A->A->Int):Dynamic;
 

+ 1 - 1
std/python/lib/PPrint.hx → std/python/lib/Pprint.hx

@@ -2,7 +2,7 @@
 package python.lib;
 
 @:pythonImport("pprint")
-extern class PPrint {
+extern class Pprint {
 
 
 	public static function pprint (x:Dynamic):Void;

+ 1 - 1
std/python/lib/ShUtil.hx → std/python/lib/Shutil.hx

@@ -3,7 +3,7 @@ package python.lib;
 
 
 @:pythonImport("shutil")
-extern class ShUtil {
+extern class Shutil {
 
 	public static function rmtree(path:String, ?ignore_errors:Bool=false, ?onerror:python.lib.Exceptions.BaseException->Void):Void;
 

+ 13 - 13
std/python/lib/datetime/DateTime.hx → std/python/lib/datetime/Datetime.hx

@@ -3,13 +3,13 @@ package python.lib.datetime;
 
 
 @:pythonImport("datetime", "datetime")
-extern class DateTime {
+extern class Datetime {
 
-	public function new (year:Int, month:Int, day:Int, hour:Int=0, minute:Int=0, second:Int=0, microsecond:Int=0, tzinfo:TzInfo=null);
+	public function new (year:Int, month:Int, day:Int, hour:Int=0, minute:Int=0, second:Int=0, microsecond:Int=0, tzinfo:Tzinfo=null);
 
-	public static var min : DateTime;
-	public static var max : DateTime;
-	public static var resolution : TimeDelta;
+	public static var min : Datetime;
+	public static var max : Datetime;
+	public static var resolution : Timedelta;
 
 	public var year : Int;
 	public var month : Int;
@@ -18,19 +18,19 @@ extern class DateTime {
 	public var minute : Int;
 	public var second : Int;
 	public var microsecond : Int;
-	public var tzinfo : TzInfo;
+	public var tzinfo : Tzinfo;
 
 
 
-	public static function today ():DateTime;
-	public static function now (?tzinfo:TzInfo):DateTime;
-	public static function utcnow ():DateTime;
-	public static function fromtimestamp (timestamp:Float, tzInfo:TzInfo=null):DateTime;
-	public static function utcfromtimestamp (timestamp:Int):DateTime;
-	public static function fromordinal (ordinal:Int):DateTime;
+	public static function today ():Datetime;
+	public static function now (?tzinfo:Tzinfo):Datetime;
+	public static function utcnow ():Datetime;
+	public static function fromtimestamp (timestamp:Float, tzInfo:Tzinfo=null):Datetime;
+	public static function utcfromtimestamp (timestamp:Int):Datetime;
+	public static function fromordinal (ordinal:Int):Datetime;
 
 	public function strftime (format:String):String;
-	public function replace (?year:Int = 1970, ?month:Int = 1, ?day:Int = 1, ?hour:Int = 0, ?minute:Int = 0, ?second:Int, ?microsecond:Int, ?tzinfo:TzInfo):DateTime;
+	public function replace (?year:Int = 1970, ?month:Int = 1, ?day:Int = 1, ?hour:Int = 0, ?minute:Int = 0, ?second:Int, ?microsecond:Int, ?tzinfo:Tzinfo):Datetime;
 	/* 0-6 */
 	public function weekday():Int;
 	/* 1-7 */

+ 4 - 4
std/python/lib/datetime/TimeDelta.hx → std/python/lib/datetime/Timedelta.hx

@@ -1,11 +1,11 @@
 package python.lib.datetime;
 
 @:pythonImport("datetime", "timedelta")
-extern class TimeDelta {
+extern class Timedelta {
 
-	static var min : TimeDelta;
-	static var max : TimeDelta;
-	static var resolution : TimeDelta;
+	static var min : Timedelta;
+	static var max : Timedelta;
+	static var resolution : Timedelta;
 
 	var days : Int;
 	var seconds : Int;

+ 2 - 3
std/python/lib/datetime/Timezone.hx

@@ -1,8 +1,7 @@
-
 package python.lib.datetime;
 
 @:pythonImport("datetime", "timezone")
-extern class Timezone extends TzInfo {
+extern class Timezone extends Tzinfo {
 
-	public static var utc(default, never):TzInfo;
+	public static var utc(default, never):Tzinfo;
 }

+ 1 - 1
std/python/lib/datetime/TzInfo.hx → std/python/lib/datetime/Tzinfo.hx

@@ -2,5 +2,5 @@
 package python.lib.datetime;
 
 @:pythonImport("datetime", "tzinfo")
-extern class TzInfo {
+extern class Tzinfo {
 }

+ 6 - 6
tests/unit/src/unit/TestPython.hx

@@ -11,7 +11,7 @@ import python.NativeArrayTools;
 import python.NativeStringTools;
 
 import python.lib.Codecs;
-import python.lib.FuncTools;
+import python.lib.Functools;
 import python.lib.Glob;
 import python.lib.Inspect;
 import python.lib.Json;
@@ -19,11 +19,11 @@ import python.lib.Json;
 import python.lib.Math;
 import python.lib.Msvcrt;
 import python.lib.Os;
-import python.lib.PPrint;
+import python.lib.Pprint;
 import python.lib.Random;
 import python.lib.Re;
 import python.lib.Set;
-import python.lib.ShUtil;
+import python.lib.Shutil;
 import python.lib.Subprocess;
 import python.lib.Sys;
 import python.lib.Tempfile;
@@ -34,10 +34,10 @@ import python.lib.Traceback;
 import python.lib.Tty;
 import python.lib.Tuple;
 
-import python.lib.datetime.DateTime;
-import python.lib.datetime.TimeDelta;
+import python.lib.datetime.Datetime;
+import python.lib.datetime.Timedelta;
 import python.lib.datetime.Timezone;
-import python.lib.datetime.TzInfo;
+import python.lib.datetime.Tzinfo;
 
 import python.lib.io.BufferedIOBase;
 import python.lib.io.BufferedRWPair;