Fix imports.

This commit is contained in:
Valentin Lorentz 2015-08-09 09:21:12 +02:00
parent 5b9e07ecd2
commit 17bf893437
3 changed files with 4 additions and 3 deletions

View File

@ -48,6 +48,7 @@ import supybot.irclib as irclib
import supybot.plugin as plugin import supybot.plugin as plugin
import supybot.plugins as plugins import supybot.plugins as plugins
import supybot.drivers as drivers import supybot.drivers as drivers
import supybot.minisix as minisix
import supybot.ircmsgs as ircmsgs import supybot.ircmsgs as ircmsgs
import supybot.ircutils as ircutils import supybot.ircutils as ircutils
import supybot.registry as registry import supybot.registry as registry
@ -398,7 +399,7 @@ class Owner(callbacks.Plugin):
L.append(format('linecache line cache flushed: %n cleared.', L.append(format('linecache line cache flushed: %n cleared.',
(len(linecache.cache), 'line'))) (len(linecache.cache), 'line')))
linecache.clearcache() linecache.clearcache()
if sys.version_info[0] >= 3: if minisix.PY2:
sys.exc_clear() sys.exc_clear()
collected = world.upkeep() collected = world.upkeep()
if gc.garbage: if gc.garbage:

View File

@ -42,7 +42,7 @@ import multiprocessing
import re import re
from . import conf, drivers, ircutils, log, registry from . import conf, drivers, ircutils, log, minisix, registry
startedAt = time.time() # Just in case it doesn't get set later. startedAt = time.time() # Just in case it doesn't get set later.

View File

@ -133,7 +133,7 @@ class GenTest(SupyTestCase):
self.assertEqual(list(AL.keys()), [1, 2, 3]) self.assertEqual(list(AL.keys()), [1, 2, 3])
if minisix.PY2: if minisix.PY2:
self.assertEqual(list(AL.keys()), [1, 2, 3]) self.assertEqual(list(AL.keys()), [1, 2, 3])
self.assertEqual(AL.values(), [2, 3, 4]) self.assertEqual(list(AL.values()), [2, 3, 4])
self.assertEqual(list(AL.values()), [2, 3, 4]) self.assertEqual(list(AL.values()), [2, 3, 4])
self.assertEqual(len(AL), 3) self.assertEqual(len(AL), 3)