chore: Further remove Python 2 compat hacks

Author: C0rn3j

COPYING

@@ -21,20 +21,3 @@ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-The license for the file `musicbrainzngs/compat.py` is
-
-Copyright (c) 2012 Kenneth Reitz.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

musicbrainzngs/compat.py

@@ -1,25 +1,5 @@
-# Copyright (c) 2012 Kenneth Reitz.
-
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-"""pythoncompat"""
-import sys
 from http.client import BadStatusLine, HTTPException
 from io import StringIO
 from urllib.error import HTTPError, URLError
 from urllib.parse import quote_plus, urlencode, urlunparse
 from urllib.request import HTTPDigestAuthHandler, HTTPHandler, HTTPPasswordMgr, Request, build_opener
-
-unicode = str
-bytes = bytes
-basestring = (str,bytes)

musicbrainzngs/musicbrainz.py

@@ -253,9 +253,9 @@ def _check_filter_and_make_params(entity, includes, release_status=[], release_t
     the filters can be used with the given includes. Return a params
     dict that can be passed to _do_mb_query.
     """
-    if isinstance(release_status, compat.basestring):
+    if isinstance(release_status, (str,bytes)):
         release_status = [release_status]
-    if isinstance(release_type, compat.basestring):
+    if isinstance(release_type, (str,bytes)):
         release_type = [release_type]
     _check_filter(release_status, VALID_RELEASE_STATUSES)
     _check_filter(release_type, VALID_RELEASE_TYPES)
@@ -640,7 +640,7 @@ def _mb_request(path, method='GET', auth_required=AUTH_NO,
     # Encode Unicode arguments using UTF-8.
     newargs = []
     for key, value in sorted(args.items()):
-        if isinstance(value, compat.unicode):
+        if isinstance(value, str):
             value = value.encode('utf8')
         newargs.append((key, value))
 

musicbrainzngs/util.py

@@ -15,24 +15,24 @@ def _unicode(string, encoding=None):
     This can only be a guess, but this might be better than failing.
     It is safe to use this on numbers or strings that are already unicode.
     """
-    if isinstance(string, compat.unicode):
+    if isinstance(string, str):
         unicode_string = string
-    elif isinstance(string, compat.bytes):
+    elif isinstance(string, bytes):
         # use given encoding, stdin, preferred until something != None is found
         if encoding is None:
             encoding = sys.stdin.encoding
         if encoding is None:
             encoding = locale.getpreferredencoding()
         unicode_string = string.decode(encoding, "ignore")
     else:
-        unicode_string = compat.unicode(string)
+        unicode_string = str(string)
     return unicode_string.replace('\x00', '').strip()
 
 def bytes_to_elementtree(bytes_or_file):
 	"""Given a bytestring or a file-like object that will produce them,
 	parse and return an ElementTree.
 	"""
-	if isinstance(bytes_or_file, compat.basestring):
+	if isinstance(bytes_or_file, (str,bytes)):
 		s = bytes_or_file
 	else:
 		s = bytes_or_file.read()

test/_common.py

@@ -27,7 +27,7 @@ def open(self, request, body=None):
         if self.exception:
             raise self.exception
 
-        if isinstance(self.response, compat.unicode):
+        if isinstance(self.response, str):
             return StringIO.StringIO(self.response)
         else:
             return BytesIO(self.response)