forked from metin-server/m2dev-client
fix: Python shutdown errors
This commit is contained in:
@@ -325,30 +325,30 @@ class LoginWindow(ui.ScriptWindow):
|
|||||||
|
|
||||||
def __SaveChannelInfo(self):
|
def __SaveChannelInfo(self):
|
||||||
try:
|
try:
|
||||||
file=open("channel.inf", "w")
|
with open("channel.inf", "w") as file:
|
||||||
file.write("%d %d %d" % (self.__GetServerID(), self.__GetChannelID(), self.__GetRegionID()))
|
file.write("%d %d %d" % (self.__GetServerID(), self.__GetChannelID(), self.__GetRegionID()))
|
||||||
except:
|
except:
|
||||||
print "LoginWindow.__SaveChannelInfo - SaveError"
|
print "LoginWindow.__SaveChannelInfo - SaveError"
|
||||||
|
|
||||||
def __LoadChannelInfo(self):
|
def __LoadChannelInfo(self):
|
||||||
try:
|
try:
|
||||||
file=open("channel.inf")
|
with open("channel.inf") as file:
|
||||||
lines=file.readlines()
|
lines=file.readlines()
|
||||||
|
|
||||||
if len(lines)>0:
|
|
||||||
tokens=lines[0].split()
|
|
||||||
|
|
||||||
selServerID=int(tokens[0])
|
if len(lines)>0:
|
||||||
selChannelID=int(tokens[1])
|
tokens=lines[0].split()
|
||||||
|
|
||||||
if len(tokens) == 3:
|
|
||||||
regionID = int(tokens[2])
|
|
||||||
|
|
||||||
return regionID, selServerID, selChannelID
|
selServerID=int(tokens[0])
|
||||||
|
selChannelID=int(tokens[1])
|
||||||
|
|
||||||
|
if len(tokens) == 3:
|
||||||
|
regionID = int(tokens[2])
|
||||||
|
|
||||||
|
return regionID, selServerID, selChannelID
|
||||||
|
|
||||||
except:
|
except:
|
||||||
print "LoginWindow.__LoadChannelInfo - OpenError"
|
print "LoginWindow.__LoadChannelInfo - OpenError"
|
||||||
return -1, -1, -1
|
return -1, -1, -1
|
||||||
|
|
||||||
def __ExitGame(self):
|
def __ExitGame(self):
|
||||||
app.Exit()
|
app.Exit()
|
||||||
|
|||||||
@@ -27,7 +27,8 @@ class CursorImage(object):
|
|||||||
self.LoadImage(imageName)
|
self.LoadImage(imageName)
|
||||||
|
|
||||||
def __del__(self):
|
def __del__(self):
|
||||||
grpImage.Delete(self.handle)
|
if grpImage and self.handle:
|
||||||
|
grpImage.Delete(self.handle)
|
||||||
|
|
||||||
def LoadImage(self, imageName):
|
def LoadImage(self, imageName):
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -9,21 +9,19 @@ def SaveLastPlayFieldMusic():
|
|||||||
global fieldMusic
|
global fieldMusic
|
||||||
|
|
||||||
try:
|
try:
|
||||||
lastPlayFile=open("BGM/lastplay.inf", "w")
|
with open("BGM/lastplay.inf", "w") as lastPlayFile:
|
||||||
|
lastPlayFile.write(fieldMusic)
|
||||||
except IOError:
|
except IOError:
|
||||||
return
|
return
|
||||||
|
|
||||||
lastPlayFile.write(fieldMusic)
|
|
||||||
|
|
||||||
|
|
||||||
def LoadLastPlayFieldMusic():
|
def LoadLastPlayFieldMusic():
|
||||||
global fieldMusic
|
global fieldMusic
|
||||||
|
|
||||||
try:
|
try:
|
||||||
lastPlayFile=open("BGM/lastplay.inf", "r")
|
with open("BGM/lastplay.inf", "r") as lastPlayFile:
|
||||||
|
fieldMusic=lastPlayFile.read()
|
||||||
except IOError:
|
except IOError:
|
||||||
return
|
return
|
||||||
|
|
||||||
fieldMusic=lastPlayFile.read()
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,8 @@ class LogBoxFile:
|
|||||||
self.restore()
|
self.restore()
|
||||||
|
|
||||||
def restore(self):
|
def restore(self):
|
||||||
sys.stderr = self.stderrSave
|
if sys:
|
||||||
|
sys.stderr = self.stderrSave
|
||||||
|
|
||||||
def write(self, msg):
|
def write(self, msg):
|
||||||
self.msg = self.msg + msg
|
self.msg = self.msg + msg
|
||||||
|
|||||||
@@ -98,7 +98,8 @@ class Window(object):
|
|||||||
self.Hide()
|
self.Hide()
|
||||||
|
|
||||||
def __del__(self):
|
def __del__(self):
|
||||||
wndMgr.Destroy(self.hWnd)
|
if wndMgr and self.hWnd:
|
||||||
|
wndMgr.Destroy(self.hWnd)
|
||||||
|
|
||||||
def RegisterWindow(self, layer):
|
def RegisterWindow(self, layer):
|
||||||
self.hWnd = wndMgr.Register(self, layer)
|
self.hWnd = wndMgr.Register(self, layer)
|
||||||
|
|||||||
@@ -26,11 +26,13 @@ def GetMouseButtonSettings():
|
|||||||
|
|
||||||
def SaveMouseButtonSettings():
|
def SaveMouseButtonSettings():
|
||||||
global MOUSE_SETTINGS
|
global MOUSE_SETTINGS
|
||||||
open("mouse.cfg", "w").write("%s\t%s" % tuple(MOUSE_SETTINGS))
|
with open("mouse.cfg", "w") as f:
|
||||||
|
f.write("%s\t%s" % tuple(MOUSE_SETTINGS))
|
||||||
|
|
||||||
def LoadMouseButtonSettings():
|
def LoadMouseButtonSettings():
|
||||||
global MOUSE_SETTINGS
|
global MOUSE_SETTINGS
|
||||||
tokens = open("mouse.cfg", "r").read().split()
|
with open("mouse.cfg", "r") as f:
|
||||||
|
tokens = f.read().split()
|
||||||
|
|
||||||
if len(tokens) != 2:
|
if len(tokens) != 2:
|
||||||
raise RuntimeError, "MOUSE_SETTINGS_FILE_ERROR"
|
raise RuntimeError, "MOUSE_SETTINGS_FILE_ERROR"
|
||||||
|
|||||||
@@ -46,10 +46,10 @@ class Sandbox(object):
|
|||||||
sys.modules[prevented_module_name] = None
|
sys.modules[prevented_module_name] = None
|
||||||
|
|
||||||
try:
|
try:
|
||||||
f = open(filename, 'rb')
|
with open(filename, 'rb') as f:
|
||||||
data = f.read()
|
data = f.read()
|
||||||
code = compile(data, filename, 'exec')
|
code = compile(data, filename, 'exec')
|
||||||
exec code in dic
|
exec code in dic
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
sys.stderr.write(e)
|
sys.stderr.write(e)
|
||||||
finally:
|
finally:
|
||||||
|
|||||||
Reference in New Issue
Block a user