From d7d5ccea505b7698898300b59e36804c1fcf3b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= Date: Sun, 16 Aug 2009 23:29:04 +0200 Subject: [PATCH] scripts/supybot: Unify the `os.linesep' vs '\n' usage. Signed-off-by: James Vega (cherry picked from commit 2242b2602531ac7438138968ba3e771b136f5cb6) --- scripts/supybot | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/supybot b/scripts/supybot index c8b5da92c..9b66e0f70 100644 --- a/scripts/supybot +++ b/scripts/supybot @@ -45,7 +45,8 @@ import signal import cStringIO as StringIO if sys.version_info < (2, 3, 0): - sys.stderr.write('This program requires Python >= 2.3.0\n') + sys.stderr.write('This program requires Python >= 2.3.0') + sys.stderr.write(os.linesep) sys.exit(-1) def _termHandler(signalNumber, stackFrame): @@ -171,7 +172,8 @@ if __name__ == '__main__': if os.name == 'posix': if (os.getuid() == 0 or os.geteuid() == 0) and not options.allowRoot: - sys.stderr.write('Dude, don\'t even try to run this as root.\n') + sys.stderr.write('Dude, don\'t even try to run this as root.') + sys.stderr.write(os.linesep) sys.exit(-1) if len(args) > 1: @@ -208,9 +210,10 @@ if __name__ == '__main__': errmsg = textwrap.fill('%s: %s' % (name, e), width=78, subsequent_indent=' '*len(name)) sys.stderr.write(errmsg) - sys.stderr.write('\n') + sys.stderr.write(os.linesep) sys.stderr.write('Please fix this error in your configuration file ' - 'and restart your bot.\n') + 'and restart your bot.') + sys.stderr.write(os.linesep) sys.exit(-1) import supybot.conf as conf import supybot.world as world @@ -292,7 +295,7 @@ if __name__ == '__main__': try: fd = file(pidFile, 'w') pid = os.getpid() - fd.write('%s\n' % pid) + fd.write('%s%s' % (pid, os.linesep)) fd.close() def removePidFile(): try: