From 14fa11ebbd3a9b1c72c60250b69842aa03b8f945 Mon Sep 17 00:00:00 2001 From: ChillerDragon Date: Sat, 29 Feb 2020 13:21:22 +0100 Subject: [PATCH 1/2] Few simple ports to py3 in server scripts --- servers/scripts/big.py | 2 +- servers/scripts/convert.py | 2 +- servers/scripts/saverace.py | 4 ++-- servers/scripts/saveteamsrace.py | 4 ++-- servers/scripts/toinserts.py | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/servers/scripts/big.py b/servers/scripts/big.py index e737d39..8dd2047 100644 --- a/servers/scripts/big.py +++ b/servers/scripts/big.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 # coding=utf-8 import readline import sys diff --git a/servers/scripts/convert.py b/servers/scripts/convert.py index ee636e7..37070fa 100755 --- a/servers/scripts/convert.py +++ b/servers/scripts/convert.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 import sys s = 'broadcast "' for line in sys.stdin: diff --git a/servers/scripts/saverace.py b/servers/scripts/saverace.py index 7cb68e1..b1475ff 100755 --- a/servers/scripts/saverace.py +++ b/servers/scripts/saverace.py @@ -1,7 +1,7 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 import _mysql f = open('race') for l in f: x = l.rstrip('\n').split("\t") x[1] = _mysql.escape_string(x[1]) - print 'insert into record_race(Map, Name, Timestamp, Time, cp1, cp2, cp3, cp4, cp5, cp6, cp7, cp8, cp9, cp10, cp11, cp12, cp13, cp14, cp15, cp16, cp17, cp18, cp19, cp20, cp21, cp22, cp23, cp24, cp25) VALUES ("%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s");' % tuple(x) + print('insert into record_race(Map, Name, Timestamp, Time, cp1, cp2, cp3, cp4, cp5, cp6, cp7, cp8, cp9, cp10, cp11, cp12, cp13, cp14, cp15, cp16, cp17, cp18, cp19, cp20, cp21, cp22, cp23, cp24, cp25) VALUES ("%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s", "%s");' % tuple(x)) diff --git a/servers/scripts/saveteamsrace.py b/servers/scripts/saveteamsrace.py index adc59b2..5782971 100755 --- a/servers/scripts/saveteamsrace.py +++ b/servers/scripts/saveteamsrace.py @@ -1,7 +1,7 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 import _mysql f = open('teamrace') for l in f: x = l.rstrip('\n').split("\t") x[1] = _mysql.escape_string(x[1]) - print 'insert into record_teamrace(Map, Name, Timestamp, Time, ID) VALUES ("%s", "%s", "%s", "%s", "%s");' % tuple(x) + print('insert into record_teamrace(Map, Name, Timestamp, Time, ID) VALUES ("%s", "%s", "%s", "%s", "%s");' % tuple(x)) diff --git a/servers/scripts/toinserts.py b/servers/scripts/toinserts.py index 7a23f5b..e287f7a 100755 --- a/servers/scripts/toinserts.py +++ b/servers/scripts/toinserts.py @@ -1,6 +1,6 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 import sys for line in sys.stdin: args = tuple(map(lambda x: x.strip(), line.split("|"))[1:30]) - print "INSERT IGNORE INTO record_race(Map, Name, Timestamp, Time, cp1, cp2, cp3, cp4, cp5, cp6, cp7, cp8, cp9, cp10, cp11, cp12, cp13, cp14, cp15, cp16, cp17, cp18, cp19, cp20, cp21, cp22, cp23, cp24, cp25) VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s');" % args + print("INSERT IGNORE INTO record_race(Map, Name, Timestamp, Time, cp1, cp2, cp3, cp4, cp5, cp6, cp7, cp8, cp9, cp10, cp11, cp12, cp13, cp14, cp15, cp16, cp17, cp18, cp19, cp20, cp21, cp22, cp23, cp24, cp25) VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s');" % args) From e97e6749a346a0aaf585f1c9f078cf1926302461 Mon Sep 17 00:00:00 2001 From: ChillerDragon Date: Sun, 1 Mar 2020 14:14:22 +0100 Subject: [PATCH 2/2] Add py3 coding thanks to @Rei-Tw --- servers/scripts/big.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/scripts/big.py b/servers/scripts/big.py index 8dd2047..3a05138 100644 --- a/servers/scripts/big.py +++ b/servers/scripts/big.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# coding=utf-8 +# -*- coding: utf-8 -*- import readline import sys