diff --git a/otp/login/AstronLoginManagerUD.py b/otp/login/AstronLoginManagerUD.py index 04eec67..a3881df 100644 --- a/otp/login/AstronLoginManagerUD.py +++ b/otp/login/AstronLoginManagerUD.py @@ -1,7 +1,5 @@ import dbm -import dbm.dumb import json -import sys import time from datetime import datetime @@ -24,11 +22,6 @@ class AccountDB: # Setup the dbm: accountDbFile = config.GetString('accountdb-local-file', 'astron/databases/accounts.db') - if sys.platform == 'darwin': # macOS - dbm = dumbdbm - else: - dbm = anydbm - self.dbm = dbm.open(accountDbFile, 'c') def lookup(self, playToken, callback): diff --git a/toontown/makeatoon/NameGenerator.py b/toontown/makeatoon/NameGenerator.py index 760e3ac..5a9aa0f 100644 --- a/toontown/makeatoon/NameGenerator.py +++ b/toontown/makeatoon/NameGenerator.py @@ -45,9 +45,9 @@ class NameGenerator: input = StreamReader(vfs.openReadFile(filename, 1), 1) currentLine = input.readline() while currentLine: - if currentLine.lstrip()[0:1] != '#': - a1 = currentLine.find('*') - a2 = currentLine.find('*', a1 + 1) + if currentLine.lstrip()[0:1] != b'#': + a1 = currentLine.find(b'*') + a2 = currentLine.find(b'*', a1 + 1) self.nameDictionary[int(currentLine[0:a1])] = (int(currentLine[a1 + 1:a2]), currentLine[a2 + 1:len(currentLine) - 1]) currentLine = input.readline()