diff --git a/scripts/supybot b/scripts/supybot index eefae7d81..3e4a5e53c 100644 --- a/scripts/supybot +++ b/scripts/supybot @@ -42,17 +42,14 @@ import sys import atexit import shutil 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): sys.stderr.write('This program requires Python 3.4 or later.') sys.stderr.write(os.linesep) sys.exit(-1) +from io import StringIO # Import this after version check since this will fail on Python 2 + def _termHandler(signalNumber, stackFrame): raise SystemExit('Signal #%s.' % signalNumber) diff --git a/scripts/supybot-plugin-doc b/scripts/supybot-plugin-doc index a755f5d1a..a4960191f 100644 --- a/scripts/supybot-plugin-doc +++ b/scripts/supybot-plugin-doc @@ -36,9 +36,6 @@ import shutil import supybot -if sys.version_info[0] >= 3: - basestring = str - def error(s): sys.stderr.write('%s\n' % s) sys.exit(-1) @@ -217,7 +214,7 @@ class PluginDoc(object): indent = origindent + 1 try: default = str(v) - if not isinstance(v._default, basestring): + if not isinstance(v._default, str): default = utils.str.dqrepr(default) help = v.help() except registry.NonExistentRegistryEntry: