plugins Q-Z: remove minisix uses and unused builtin imports

Author: jlu5

plugins/QuoteGrabs/plugin.py

@@ -38,7 +38,6 @@
 import supybot.conf as conf
 import supybot.utils as utils
 from supybot.commands import *
-import supybot.utils.minisix as minisix
 import supybot.ircmsgs as ircmsgs
 import supybot.plugins as plugins
 import supybot.ircutils as ircutils
@@ -88,14 +87,10 @@ def p(s1, s2):
             return self.dbs[filename]
         if os.path.exists(filename):
             db = sqlite3.connect(filename)
-            if minisix.PY2:
-                db.text_factory = str
             db.create_function('nickeq', 2, p)
             self.dbs[filename] = db
             return db
         db = sqlite3.connect(filename)
-        if minisix.PY2:
-            db.text_factory = str
         db.create_function('nickeq', 2, p)
         self.dbs[filename] = db
         cursor = db.cursor()

plugins/RSS/plugin.py

@@ -46,7 +46,6 @@
 import supybot.utils as utils
 import supybot.world as world
 from supybot.commands import *
-import supybot.utils.minisix as minisix
 import supybot.ircmsgs as ircmsgs
 import supybot.ircutils as ircutils
 import supybot.registry as registry
@@ -59,10 +58,7 @@
 else:
     INIT_DELAY = 10
 
-if minisix.PY2:
-    from urllib2 import ProxyHandler
-else:
-    from urllib.request import ProxyHandler
+from urllib.request import ProxyHandler
 
 from .config import register_feed_config
 

plugins/Scheduler/plugin.py

@@ -30,7 +30,7 @@
 
 import time
 import os
-import math
+import pickle
 import shutil
 import tempfile
 
@@ -43,9 +43,6 @@
 _ = PluginInternationalization('Scheduler')
 import supybot.world as world
 
-import supybot.utils.minisix as minisix
-pickle = minisix.pickle
-
 datadir = conf.supybot.directories.data()
 filename = conf.supybot.directories.data.dirize('Scheduler.pickle')
 

plugins/Seen/plugin.py

@@ -40,7 +40,6 @@
 import supybot.ircdb as ircdb
 from supybot.commands import *
 import supybot.irclib as irclib
-import supybot.utils.minisix as minisix
 import supybot.ircmsgs as ircmsgs
 import supybot.plugins as plugins
 import supybot.ircutils as ircutils
@@ -204,8 +203,6 @@ def _seen(self, irc, channel, name, any=False):
                                      nick, channel,
                                      utils.timeElapsed(time.time()-when))
                 if self.registryValue('showLastMessage', channel, irc.network):
-                    if minisix.PY2:
-                        said = said.decode('utf8')
                     reply = _('%s: %s') % (reply, said)
                 irc.reply(reply)
             elif len(results) > 1:

plugins/String/plugin.py

@@ -30,16 +30,12 @@
 ###
 
 import re
-import sys
-import types
 import codecs
-import base64
 import binascii
 import unicodedata
 
 import supybot.utils as utils
 from supybot.commands import *
-import supybot.utils.minisix as minisix
 import supybot.plugins as plugins
 import supybot.commands as commands
 import supybot.ircutils as ircutils
@@ -120,9 +116,7 @@ def encode(self, irc, msg, args, encoding, text):
             text = codecs.getencoder('base64_codec')(text)[0].decode()
 
         # Change result into a string
-        if minisix.PY2 and isinstance(text, unicode):
-            text = text.encode('utf-8')
-        elif minisix.PY3 and isinstance(text, bytes):
+        if isinstance(text, bytes):
             text = text.decode()
 
         if encoding in ('base64', 'base64_codec'):
@@ -152,7 +146,7 @@ def decode(self, irc, msg, args, encoding, text):
             decoder = codecs.getdecoder(encoding)
         except LookupError:
             irc.errorInvalid(_('encoding'), encoding)
-        if minisix.PY3 and not isinstance(text, bytes):
+        if not isinstance(text, bytes):
             text = text.encode()
         try:
             text = decoder(text)[0]
@@ -163,9 +157,7 @@ def decode(self, irc, msg, args, encoding, text):
             return
 
         # Change result into a string
-        if minisix.PY2 and isinstance(text, unicode):
-            text = text.encode('utf-8')
-        elif minisix.PY3 and isinstance(text, bytes):
+        if isinstance(text, bytes):
             try:
                 text = text.decode()
             except UnicodeDecodeError:

plugins/Topic/plugin.py

@@ -30,6 +30,7 @@
 
 import os
 import re
+import pickle
 import random
 import shutil
 import tempfile
@@ -48,9 +49,6 @@
 
 import supybot.ircdb as ircdb
 
-import supybot.utils.minisix as minisix
-pickle = minisix.pickle
-
 def canChangeTopic(irc, msg, args, state):
     assert not state.channel
     callConverter('channel', irc, msg, args, state)

plugins/URL/plugin.py

@@ -35,7 +35,6 @@
 import supybot.conf as conf
 import supybot.utils as utils
 from supybot.commands import *
-import supybot.utils.minisix as minisix
 import supybot.plugins as plugins
 import supybot.ircmsgs as ircmsgs
 import supybot.ircutils as ircutils
@@ -116,7 +115,7 @@ def last(self, irc, msg, args, channel, optlist):
         f = None
         nolimit = False
         for (option, arg) in optlist:
-            if isinstance(arg, minisix.string_types):
+            if isinstance(arg, str):
                 arg = arg.lower()
             if option == 'nolimit':
                 nolimit = True

plugins/Unix/plugin.py

@@ -49,7 +49,6 @@
 import supybot.conf as conf
 import supybot.utils as utils
 from supybot.commands import *
-import supybot.utils.minisix as minisix
 import supybot.plugins as plugins
 import supybot.ircutils as ircutils
 import supybot.registry as registry
@@ -237,12 +236,8 @@ def fortune(self, irc, msg, args):
                           'not available.'), Raise=True)
             (out, err) = inst.communicate()
             inst.wait()
-            if minisix.PY3:
-                lines = [i.decode('utf-8').rstrip() for i in out.splitlines()]
-                lines = list(map(str, lines))
-            else:
-                lines = out.splitlines()
-                lines = list(map(str.rstrip, lines))
+            lines = [i.decode('utf-8').rstrip() for i in out.splitlines()]
+            lines = list(map(str, lines))
             lines = filter(None, lines)
             irc.replies(lines, joiner=' ')
         else:

plugins/Web/plugin.py

@@ -30,29 +30,21 @@
 ###
 
 import re
-import sys
-import string
 import socket
 
 import supybot.conf as conf
 import supybot.utils as utils
 from supybot.commands import *
-import supybot.utils.minisix as minisix
 import supybot.plugins as plugins
 import supybot.commands as commands
 import supybot.ircutils as ircutils
 import supybot.callbacks as callbacks
 from supybot.i18n import PluginInternationalization, internationalizeDocstring
 _ = PluginInternationalization('Web')
 
-if minisix.PY3:
-    from html.parser import HTMLParser
-    from html.entities import entitydefs
-    import http.client as http_client
-else:
-    from HTMLParser import HTMLParser
-    from htmlentitydefs import entitydefs
-    import httplib as http_client
+from html.parser import HTMLParser
+from html.entities import entitydefs
+import http.client as http_client
 
 class Title(utils.web.HtmlToText):
     entitydefs = entitydefs.copy()
@@ -227,15 +219,14 @@ def url_workaround(url):
         try:
             text = text.decode(encoding, 'replace')
         except UnicodeDecodeError:
-            if minisix.PY3:
-                if raiseErrors:
-                    irc.error(_('Could not guess the page\'s encoding. (Try '
-                                'installing python-charade.)'), Raise=True)
-                else:
-                    self.log.info('Web plugin TitleSnarfer: URL <%s> Could '
-                                  'not guess the page\'s encoding. (Try '
-                                  'installing python-charade.)', url)
-                    return
+            if raiseErrors:
+                irc.error(_('Could not guess the page\'s encoding. (Try '
+                            'installing python-charade.)'), Raise=True)
+            else:
+                self.log.info('Web plugin TitleSnarfer: URL <%s> Could '
+                              'not guess the page\'s encoding. (Try '
+                              'installing python-charade.)', url)
+                return
         try:
             parser = Title()
             parser.feed(text)