Changed findArtist to use the musicbrainzngs library, the output is identical.

(old musicbrainz 2 library is deprecated and broken)

lib/musicbrainzngs/__init__.py

@@ -1 +1 @@
-from musicbrainz import *
+from lib.musicbrainzngs.musicbrainz import *

lib/musicbrainzngs/compat.py

@@ -0,0 +1,62 @@
+# -*- coding: utf-8 -*-
+# 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
+
+# -------
+# 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,\
+						build_opener
+	from httplib import BadStatusLine, HTTPException
+	from urlparse import urlunparse
+	from urllib import urlencode
+
+	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
+
+	unicode = str
+	bytes = bytes
+	basestring = (str,bytes)

lib/musicbrainzngs/mbxml.py

@@ -4,9 +4,11 @@
 # See the COPYING file for more information.
 
 import xml.etree.ElementTree as ET
-import string
-import StringIO
 import logging
+
+from lib.musicbrainzngs import compat
+from lib.musicbrainzngs import util
+
 try:
 	from ET import fixtag
 except:
@@ -16,7 +18,7 @@ except:
 		# tag and namespace declaration, if any
 		if isinstance(tag, ET.QName):
 			tag = tag.text
-		namespace_uri, tag = string.split(tag[1:], "}", 1)
+		namespace_uri, tag = tag[1:].split("}", 1)
 		prefix = namespaces.get(namespace_uri)
 		if prefix is None:
 			prefix = "ns%d" % len(namespaces)
@@ -29,6 +31,7 @@ except:
 			xmlns = None
 		return "%s:%s" % (prefix, tag), xmlns
 
+
 NS_MAP = {"http://musicbrainz.org/ns/mmd-2.0#": "ws2",
           "http://musicbrainz.org/ns/ext#-2.0": "ext"}
 _log = logging.getLogger("python-musicbrainz-ngs")
@@ -113,9 +116,7 @@ def parse_inner(inner_els, element):
 	return result
 
 def parse_message(message):
-	s = message.read()
-	f = StringIO.StringIO(s)
-	tree = ET.ElementTree(file=f)
+	tree = util.bytes_to_elementtree(message)
 	root = tree.getroot()
 	result = {}
 	valid_elements = {"artist": parse_artist,
@@ -176,7 +177,8 @@ def parse_artist_list(al):
 def parse_artist(artist):
 	result = {}
 	attribs = ["id", "type", "ext:score"]
-	elements = ["name", "sort-name", "country", "user-rating", "disambiguation"]
+	elements = ["name", "sort-name", "country", "user-rating",
+				"disambiguation", "gender", "ipi"]
 	inner_els = {"life-span": parse_artist_lifespan,
 	             "recording-list": parse_recording_list,
 	             "release-list": parse_release_list,
@@ -199,7 +201,8 @@ def parse_label_list(ll):
 def parse_label(label):
 	result = {}
 	attribs = ["id", "type", "ext:score"]
-	elements = ["name", "sort-name", "country", "label-code", "user-rating"]
+	elements = ["name", "sort-name", "country", "label-code", "user-rating",
+				"ipi", "disambiguation"]
 	inner_els = {"life-span": parse_artist_lifespan,
 	             "release-list": parse_release_list,
 	             "tag-list": parse_tag_list,

lib/musicbrainzngs/util.py

@@ -0,0 +1,37 @@
+# This file is part of the musicbrainzngs library
+# Copyright (C) Alastair Porter, Adrian Sampson, and others
+# This file is distributed under a BSD-2-Clause type license.
+# See the COPYING file for more information.
+
+import sys
+import locale
+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.
+    It is safe to use this on numbers or strings that are already unicode.
+    """
+    if isinstance(string, compat.unicode):
+        unicode_string = string
+    elif isinstance(string, compat.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)
+    return unicode_string.replace('\x00', '').strip()
+
+def bytes_to_elementtree(_bytes):
+    if compat.is_py3:
+        s = _unicode(_bytes.read(), "utf-8")
+    else:
+        s = _bytes.read()
+    f = compat.StringIO(s)
+    tree = ET.ElementTree(file=f)
+    return tree