Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-03-30 04:16:49 +02:00
Code Issues Projects Releases Wiki Activity

Fix crash when --daemon is given (Python 3).

Browse Source
This commit is contained in:
Valentin Lorentz 2013-06-29 13:58:41 +02:00
parent dce3c97fe4
commit 46b89cfc0e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/supybot
View File

@ -44,6 +44,7 @@ import shutil
import signal import signal
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
import cStringIO as StringIO import cStringIO as StringIO
StringIO = StringIO.StringIO
else: else:
from io import StringIO from io import StringIO
@ -273,8 +274,8 @@ if __name__ == '__main__':
# level WARNING on upkeep. # level WARNING on upkeep.
sys.stdout.close() sys.stdout.close()
sys.stderr.close() sys.stderr.close()
sys.stdout = StringIO.StringIO() sys.stdout = StringIO()
sys.stderr = StringIO.StringIO() sys.stderr = StringIO()
# We have to be really methodical here. # We have to be really methodical here.
os.close(0) os.close(0)
os.close(1) os.close(1)

2
src/world.py
View File

@ -149,6 +149,8 @@ def upkeep():
except IOError: # Win98 sux0rs! except IOError: # Win98 sux0rs!
pass pass
if conf.daemonized: if conf.daemonized:
if sys.version_info[0] >= 3:
from io import TextIOWrapper as file
# If we're daemonized, sys.stdout has been replaced with a StringIO # If we're daemonized, sys.stdout has been replaced with a StringIO
# object, so let's see if anything's been printed, and if so, let's # object, so let's see if anything's been printed, and if so, let's
# log.warning it (things shouldn't be printed, and we're more likely # log.warning it (things shouldn't be printed, and we're more likely