chore: Organize imports and remove some Python 2 kludges

Author: C0rn3j

docs/conf.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-#
 # musicbrainzngs documentation build configuration file, created by
 # sphinx-quickstart2 on Thu Apr 26 15:56:46 2012.
 #
@@ -11,7 +9,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

examples/collection.py

@@ -23,17 +23,13 @@
     $ ./collection.py USERNAME 4137a646-a104-4031-b549-da4e1f36a463
         --remove 0d432d8b-8865-4ae9-8479-3a197620a37b
 """
-from __future__ import print_function
-from __future__ import unicode_literals
-import musicbrainzngs
 import getpass
-from optparse import OptionParser
 import sys
+from optparse import OptionParser
+
+import musicbrainzngs
 
-try:
-    user_input = raw_input
-except NameError:
-    user_input = input
+user_input = input
 
 musicbrainzngs.set_useragent(
     "python-musicbrainzngs-example",

examples/find_disc.py

@@ -12,10 +12,10 @@
         ...
 """
 
-from __future__ import unicode_literals
-import musicbrainzngs
 import sys
 
+import musicbrainzngs
+
 musicbrainzngs.set_useragent(
     "python-musicbrainzngs-example",
     "0.1",

examples/releasesearch.py

@@ -7,11 +7,10 @@
     Released 1966-08-08 (Official)
     MusicBrainz ID: b4b04cbf-118a-3944-9545-38a0a88ff1a2
 """
-from __future__ import print_function
-from __future__ import unicode_literals
-import musicbrainzngs
 import sys
 
+import musicbrainzngs
+
 musicbrainzngs.set_useragent(
     "python-musicbrainzngs-example",
     "0.1",

musicbrainzngs/caa.py

@@ -11,8 +11,7 @@
 
 import json
 
-from musicbrainzngs import compat
-from musicbrainzngs import musicbrainz
+from musicbrainzngs import compat, musicbrainz
 from musicbrainzngs.util import _unicode
 
 hostname = "coverartarchive.org"

musicbrainzngs/compat.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright (c) 2012 Kenneth Reitz.
 
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -13,49 +12,14 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-"""
-pythoncompat
-"""
-
-
+"""pythoncompat"""
 import sys
-
-# -------
-# Pythons
-# -------
-
-# Syntax sugar.
-_ver = sys.version_info
-
-#: Python 2.x?
-is_py2 = (_ver[0] == 2)
-
-#: Python 3.x?
-is_py3 = (_ver[0] == 3)
-
-# ---------
-# Specifics
-# ---------
-
-if is_py2:
-	from StringIO import StringIO
-	from urllib2 import HTTPPasswordMgr, HTTPDigestAuthHandler, Request,\
-						HTTPHandler, build_opener, HTTPError, URLError
-	from httplib import BadStatusLine, HTTPException
-	from urlparse import urlunparse
-	from urllib import urlencode, quote_plus
-
-	bytes = str
-	unicode = unicode
-	basestring = basestring
-elif is_py3:
-	from io import StringIO
-	from urllib.request import HTTPPasswordMgr, HTTPDigestAuthHandler, Request,\
-								HTTPHandler, build_opener
-	from urllib.error import HTTPError, URLError
-	from http.client import HTTPException, BadStatusLine
-	from urllib.parse import urlunparse, urlencode, quote_plus
-
-	unicode = str
-	bytes = bytes
-	basestring = (str,bytes)
+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/mbxml.py

@@ -3,9 +3,9 @@
 # This file is distributed under a BSD-2-Clause type license.
 # See the COPYING file for more information.
 
+import logging
 import re
 import xml.etree.ElementTree as ET
-import logging
 
 from . import util
 

musicbrainzngs/util.py

@@ -3,12 +3,13 @@
 # This file is distributed under a BSD-2-Clause type license.
 # See the COPYING file for more information.
 
-import sys
 import locale
+import sys
 import xml.etree.ElementTree as ET
 
 from . import compat
 
+
 def _unicode(string, encoding=None):
     """Try to decode byte strings to unicode.
     This can only be a guess, but this might be better than failing.
@@ -36,8 +37,7 @@ def bytes_to_elementtree(bytes_or_file):
 	else:
 		s = bytes_or_file.read()
 
-	if compat.is_py3:
-		s = _unicode(s, "utf-8")
+	s = _unicode(s, "utf-8")
 
 	f = compat.StringIO(s)
 	tree = ET.ElementTree(file=f)

query.py

@@ -1,8 +1,7 @@
-import sys
-
 import musicbrainzngs as m
 
-def main():
+
+def main() -> None:
 	m.set_useragent("application", "0.01", "http://example.com")
 	print(m.get_artist_by_id("952a4205-023d-4235-897c-6fdb6f58dfaa", []))
 	#print m.get_label_by_id("aab2e720-bdd2-4565-afc2-460743585f16")

test/_common.py

@@ -1,21 +1,13 @@
 """Common support for the test cases."""
+import io as StringIO
 import time
+from io import BytesIO
+from os.path import join
+from urllib.request import OpenerDirector
 
 import musicbrainzngs
 from musicbrainzngs import compat
-from os.path import join
-
-try:
-    from urllib2 import OpenerDirector
-except ImportError:
-    from urllib.request import OpenerDirector
-
-from io import BytesIO
 
-try:
-    import StringIO
-except ImportError:
-    import io as StringIO
 
 class FakeOpener(OpenerDirector):
     """ A URL Opener that saves the URL requested and