GPG: remove minisix usage

Author: jlu5

plugins/GPG/plugin.py

@@ -39,15 +39,11 @@
 import supybot.utils as utils
 import supybot.ircdb as ircdb
 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
-if minisix.PY3:
-    import http.client as http_client
-else:
-    import httplib as http_client
+import http.client as http_client
 try:
     from supybot.i18n import PluginInternationalization
     _ = PluginInternationalization('GPG')
@@ -212,7 +208,7 @@ def gettoken(self, irc, msg, args):
                 r'-----BEGIN PGP SIGNATURE-----\r?\n.*'
                 r'\r?\n-----END PGP SIGNATURE-----',
                 re.S)
-        
+
         @check_gpg_available
         def auth(self, irc, msg, args, url):
             """<url>
@@ -221,7 +217,7 @@ def auth(self, irc, msg, args, url):
             the key used is associated to a user."""
             self._expire_tokens()
             content = safe_getUrl(url)
-            if minisix.PY3 and isinstance(content, bytes):
+            if isinstance(content, bytes):
                 content = content.decode()
             match = self._auth_re.search(content)
             if not match:

plugins/GPG/test.py

@@ -27,9 +27,9 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 ###
+import io
 
 from supybot.test import *
-import supybot.utils.minisix as minisix
 
 import supybot.gpg as gpg
 
@@ -111,25 +111,25 @@ def fakeGetUrlFd(*args, **kwargs):
                 return fd
             (utils.web.getUrlFd, realGetUrlFd) = (fakeGetUrlFd, utils.web.getUrlFd)
 
-            fd = minisix.io.StringIO()
+            fd = io.StringIO()
             fd.write('foo')
             fd.seek(0)
             self.assertResponse('gpg signing auth http://foo.bar/baz.gpg',
                     'Error: Signature or token not found.')
 
-            fd = minisix.io.StringIO()
+            fd = io.StringIO()
             fd.write(token)
             fd.seek(0)
             self.assertResponse('gpg signing auth http://foo.bar/baz.gpg',
                     'Error: Signature or token not found.')
 
-            fd = minisix.io.StringIO()
+            fd = io.StringIO()
             fd.write(WRONG_TOKEN_SIGNATURE)
             fd.seek(0)
             self.assertRegexp('gpg signing auth http://foo.bar/baz.gpg',
                     'Error: Unknown token.*')
 
-            fd = minisix.io.StringIO()
+            fd = io.StringIO()
             fd.write(str(gpg.keyring.sign(token)))
             fd.seek(0)
             self.assertResponse('gpg signing auth http://foo.bar/baz.gpg',