Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-01-24 11:04:05 +01:00
Code Issues Projects Releases Wiki Activity

scripts: remove obsolete conditionals for Python 2

Browse Source
This commit is contained in:
James Lu 2020-01-05 11:31:45 -08:00
parent 7e70ce43f2
commit 5c2e16f391
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/supybot
View File

@ -42,17 +42,14 @@ import sys
import atexit import atexit
import shutil import shutil
import signal import signal
if sys.version_info[0] < 3:
import cStringIO as StringIO
StringIO = StringIO.StringIO
else:
from io import StringIO
if sys.version_info < (3, 4, 0): if sys.version_info < (3, 4, 0):
sys.stderr.write('This program requires Python 3.4 or later.') sys.stderr.write('This program requires Python 3.4 or later.')
sys.stderr.write(os.linesep) sys.stderr.write(os.linesep)
sys.exit(-1) sys.exit(-1)
from io import StringIO # Import this after version check since this will fail on Python 2
def _termHandler(signalNumber, stackFrame): def _termHandler(signalNumber, stackFrame):
raise SystemExit('Signal #%s.' % signalNumber) raise SystemExit('Signal #%s.' % signalNumber)

5
scripts/supybot-plugin-doc
View File

@ -36,9 +36,6 @@ import shutil
import supybot import supybot
if sys.version_info[0] >= 3:
basestring = str
def error(s): def error(s):
sys.stderr.write('%s\n' % s) sys.stderr.write('%s\n' % s)
sys.exit(-1) sys.exit(-1)
@ -217,7 +214,7 @@ class PluginDoc(object):
indent = origindent + 1 indent = origindent + 1
try: try:
default = str(v) default = str(v)
if not isinstance(v._default, basestring): if not isinstance(v._default, str):
default = utils.str.dqrepr(default) default = utils.str.dqrepr(default)
help = v.help() help = v.help()
except registry.NonExistentRegistryEntry: except registry.NonExistentRegistryEntry: