Fix imports.

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:

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.
 

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)