Garmelon/wot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use normal formatting instead of format strings

Browse source
This commit is contained in:
Joscha 2017-04-18 16:17:58 +00:00
parent ac65d9ab0a
commit 730a271123
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client.py
View file

@ -26,7 +26,8 @@ class Client():
self.chunkmap = None self.chunkmap = None
self.chunkmap_active = False self.chunkmap_active = False
self.address = f"ws://{address}:{port}/" #self.address = f"ws://{address}:{port}/"
self.address = "ws://{}:{}/".format(address, port)
self._drawevent = threading.Event() self._drawevent = threading.Event()
self.pool = ClientChunkPool(self) self.pool = ClientChunkPool(self)
@ -41,7 +42,8 @@ class Client():
enable_multithread=True enable_multithread=True
) )
except: except:
sys.stderr.write(f"Could not connect to server: {self.address!r}\n") #sys.stderr.write(f"Could not connect to server: {self.address!r}\n")
sys.stderr.write("Could not connect to server: {!r}\n".format(self.address))
return return
# create map etc. # create map etc.
@ -98,7 +100,8 @@ class Client():
def save_log(self, filename): def save_log(self, filename):
with open(filename, "a") as f: with open(filename, "a") as f:
f.write(f"[[[ {int(time.time())} ]]]\n") #f.write(f"[[[ {int(time.time())} ]]]\n")
f.write("[[[ {} ]]]\n".format(int(time.time())))
for msg in self.log_messages: for msg in self.log_messages:
f.write(msg + "\n") f.write(msg + "\n")
@ -156,7 +159,8 @@ class Client():
while True: while True:
i = scr.get_wch() i = scr.get_wch()
self.handle_input(i) self.handle_input(i)
self.log(f"K: {i!r}") #self.log(f"K: {i!r}")
self.log("K: {!r}".format(i))
def connection_thread(self): def connection_thread(self):
try: try:
@ -197,7 +201,8 @@ class Client():
def main(argv): def main(argv):
if len(argv) == 1 or len(argv) > 4: if len(argv) == 1 or len(argv) > 4:
print("Usage:") print("Usage:")
print(f" {argv[0]} address [port [logfile]]") #print(f" {argv[0]} address [port [logfile]]")
print(" {} address [port [logfile]]".format(argv[0]))
print(" default port: 8000") print(" default port: 8000")
return return

6
server.py
View file

@ -103,7 +103,8 @@ class WotServer(WebSocket):
i = len(self.clients) - 1 i = len(self.clients) - 1
graphstr = "".join(["┯" if j == i else ("│" if v else " ") for j, v in enumerate(self.clients)]) graphstr = "".join(["┯" if j == i else ("│" if v else " ") for j, v in enumerate(self.clients)])
print(f"{graphstr} {self.address[0]}") #print(f"{graphstr} {self.address[0]}")
print("{} {}".format(graphstr, self.address[0]))
def handleClose(self): def handleClose(self):
i = self.clients.index(self) i = self.clients.index(self)
@ -119,7 +120,8 @@ class WotServer(WebSocket):
def main(argv): def main(argv):
if len(argv) == 1 or len(argv) > 3: if len(argv) == 1 or len(argv) > 3:
print("Usage:") print("Usage:")
print(f" {argv[0]} dbfile [port]") #print(f" {argv[0]} dbfile [port]")
print(" {} dbfile [port]".format(argv[0]))
print(" default port: 8000") print(" default port: 8000")
return return