chore: Tear out StringIO hacks

Author: C0rn3j

test/_common.py

@@ -1,12 +1,10 @@
 """Common support for the test cases."""
-import io as StringIO
 import time
-from io import BytesIO
+from io import BytesIO, StringIO
 from os.path import join
 from urllib.request import OpenerDirector
 
 import musicbrainzngs
-from musicbrainzngs import compat
 
 
 class FakeOpener(OpenerDirector):
@@ -28,7 +26,7 @@ def open(self, request, body=None):
             raise self.exception
 
         if isinstance(self.response, str):
-            return StringIO.StringIO(self.response)
+            return StringIO(self.response)
         else:
             return BytesIO(self.response)
 
@@ -67,7 +65,7 @@ def restore(self):
         time.sleep = self.orig['sleep']
 
 def open_and_parse_test_data(datadir, filename):
-    """ Opens an XML file dumped from the MusicBrainz web service and returns
+    """Opens an XML file dumped from the MusicBrainz web service and returns
     the parses it.
 
     :datadir: The directory containing the file

test/test_caa.py

@@ -1,4 +1,5 @@
 import unittest
+from io import StringIO
 from urllib.error import HTTPError
 
 import musicbrainzngs
@@ -33,7 +34,7 @@ def test_get_release_group_list(self):
     def test_list_none(self):
         """ When CAA gives a 404 error, pass it through."""
 
-        exc = HTTPError("", 404, "", "", _common.StringIO.StringIO(""))
+        exc = HTTPError("", 404, "", "", StringIO(""))
         self.opener = _common.FakeOpener(exception=musicbrainzngs.ResponseError(cause=exc))
         musicbrainzngs.compat.build_opener = lambda *args: self.opener
         try:
@@ -43,7 +44,7 @@ def test_list_none(self):
             self.assertEqual(e.cause.code, 404)
 
     def test_list_baduuid(self):
-        exc = HTTPError("", 400, "", "", _common.StringIO.StringIO(""))
+        exc = HTTPError("", 400, "", "", StringIO(""))
         self.opener = _common.FakeOpener(exception=musicbrainzngs.ResponseError(cause=exc))
         musicbrainzngs.compat.build_opener = lambda *args: self.opener
         try:

test/test_collection.py

@@ -1,4 +1,5 @@
 import unittest
+from io import StringIO
 from urllib.error import HTTPError
 
 import musicbrainzngs
@@ -80,7 +81,7 @@ def local_mb_request(path, method='GET',
     def test_no_collection(self):
         """ If a collection doesn't exist, you get a 404 """
 
-        exc = HTTPError("", 404, "", "", _common.StringIO.StringIO(""))
+        exc = HTTPError("", 404, "", "", StringIO(""))
         self.opener = _common.FakeOpener(exception=musicbrainzngs.ResponseError(cause=exc))
         musicbrainzngs.compat.build_opener = lambda *args: self.opener
         try:
@@ -93,7 +94,7 @@ def test_private_collection(self):
         """ If you ask for a collection that is private, you should
         get a 401"""
 
-        exc = HTTPError("", 401, "", "", _common.StringIO.StringIO(""))
+        exc = HTTPError("", 401, "", "", StringIO(""))
         self.opener = _common.FakeOpener(exception=musicbrainzngs.AuthenticationError(cause=exc))
         musicbrainzngs.compat.build_opener = lambda *args: self.opener
         try: