From 17bf893437cf906fb3f9bc48ad1beeda0461f425 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sun, 9 Aug 2015 09:21:12 +0200 Subject: [PATCH] Fix imports. --- plugins/Owner/plugin.py | 3 ++- src/world.py | 2 +- test/test_utils.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/Owner/plugin.py b/plugins/Owner/plugin.py index 2fd783a1e..67eb4e3a1 100644 --- a/plugins/Owner/plugin.py +++ b/plugins/Owner/plugin.py @@ -48,6 +48,7 @@ import supybot.irclib as irclib import supybot.plugin as plugin import supybot.plugins as plugins import supybot.drivers as drivers +import supybot.minisix as minisix import supybot.ircmsgs as ircmsgs import supybot.ircutils as ircutils import supybot.registry as registry @@ -398,7 +399,7 @@ class Owner(callbacks.Plugin): L.append(format('linecache line cache flushed: %n cleared.', (len(linecache.cache), 'line'))) linecache.clearcache() - if sys.version_info[0] >= 3: + if minisix.PY2: sys.exc_clear() collected = world.upkeep() if gc.garbage: diff --git a/src/world.py b/src/world.py index 0a8b1db0e..bc2ea174e 100644 --- a/src/world.py +++ b/src/world.py @@ -42,7 +42,7 @@ import multiprocessing 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. diff --git a/test/test_utils.py b/test/test_utils.py index 0e7e1f792..7da0ddff6 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -133,7 +133,7 @@ class GenTest(SupyTestCase): self.assertEqual(list(AL.keys()), [1, 2, 3]) if minisix.PY2: 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(len(AL), 3)