Change lowers to casefolds (aggressive lower)
This commit is contained in:
parent
473721a67d
commit
5f38323e7d
|
@ -1245,7 +1245,7 @@ class _BaseObject(object):
|
||||||
|
|
||||||
return hash(self.network) + hash(six.text_type(type(self)) + "".join(
|
return hash(self.network) + hash(six.text_type(type(self)) + "".join(
|
||||||
list(self._get_params().keys()) + list(values)
|
list(self._get_params().keys()) + list(values)
|
||||||
).lower())
|
).casefold())
|
||||||
|
|
||||||
def _extract_cdata_from_request(self, method_name, tag_name, params):
|
def _extract_cdata_from_request(self, method_name, tag_name, params):
|
||||||
doc = self._request(method_name, True, params)
|
doc = self._request(method_name, True, params)
|
||||||
|
@ -1444,7 +1444,7 @@ class _Chartable(object):
|
||||||
self.ws_prefix + method, True, params)
|
self.ws_prefix + method, True, params)
|
||||||
|
|
||||||
seq = []
|
seq = []
|
||||||
for node in doc.getElementsByTagName(chart_kind.lower()):
|
for node in doc.getElementsByTagName(chart_kind.casefold()):
|
||||||
item = chart_type(
|
item = chart_type(
|
||||||
_extract(node, "artist"), _extract(node, "name"), self.network)
|
_extract(node, "artist"), _extract(node, "name"), self.network)
|
||||||
weight = _number(_extract(node, "playcount"))
|
weight = _number(_extract(node, "playcount"))
|
||||||
|
@ -1534,11 +1534,11 @@ class _Taggable(object):
|
||||||
tags_on_server = self.get_tags()
|
tags_on_server = self.get_tags()
|
||||||
|
|
||||||
for tag in tags_on_server:
|
for tag in tags_on_server:
|
||||||
c_old_tags.append(tag.get_name().lower())
|
c_old_tags.append(tag.get_name().casefold())
|
||||||
old_tags.append(tag.get_name())
|
old_tags.append(tag.get_name())
|
||||||
|
|
||||||
for tag in tags:
|
for tag in tags:
|
||||||
c_new_tags.append(tag.lower())
|
c_new_tags.append(tag.casefold())
|
||||||
new_tags.append(tag)
|
new_tags.append(tag)
|
||||||
|
|
||||||
for i in range(0, len(old_tags)):
|
for i in range(0, len(old_tags)):
|
||||||
|
@ -1669,10 +1669,10 @@ class _Opus(_BaseObject, _Taggable):
|
||||||
def __eq__(self, other):
|
def __eq__(self, other):
|
||||||
if type(self) != type(other):
|
if type(self) != type(other):
|
||||||
return False
|
return False
|
||||||
a = self.get_title().lower()
|
a = self.get_title().casefold()
|
||||||
b = other.get_title().lower()
|
b = other.get_title().casefold()
|
||||||
c = self.get_artist().get_name().lower()
|
c = self.get_artist().get_name().casefold()
|
||||||
d = other.get_artist().get_name().lower()
|
d = other.get_artist().get_name().casefold()
|
||||||
return (a == b) and (c == d)
|
return (a == b) and (c == d)
|
||||||
|
|
||||||
def __ne__(self, other):
|
def __ne__(self, other):
|
||||||
|
@ -1847,7 +1847,7 @@ class Artist(_BaseObject, _Taggable):
|
||||||
|
|
||||||
def __eq__(self, other):
|
def __eq__(self, other):
|
||||||
if type(self) is type(other):
|
if type(self) is type(other):
|
||||||
return self.get_name().lower() == other.get_name().lower()
|
return self.get_name().casefold() == other.get_name().casefold()
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
@ -2237,7 +2237,7 @@ class Country(_BaseObject):
|
||||||
return self.get_name()
|
return self.get_name()
|
||||||
|
|
||||||
def __eq__(self, other):
|
def __eq__(self, other):
|
||||||
return self.get_name().lower() == other.get_name().lower()
|
return self.get_name().casefold() == other.get_name().casefold()
|
||||||
|
|
||||||
def __ne__(self, other):
|
def __ne__(self, other):
|
||||||
return self.get_name() != other.get_name()
|
return self.get_name() != other.get_name()
|
||||||
|
@ -2321,12 +2321,12 @@ class Metro(_BaseObject):
|
||||||
return self.get_name() + ", " + self.get_country()
|
return self.get_name() + ", " + self.get_country()
|
||||||
|
|
||||||
def __eq__(self, other):
|
def __eq__(self, other):
|
||||||
return (self.get_name().lower() == other.get_name().lower() and
|
return (self.get_name().casefold() == other.get_name().casefold() and
|
||||||
self.get_country().lower() == other.get_country().lower())
|
self.get_country().casefold() == other.get_country().casefold())
|
||||||
|
|
||||||
def __ne__(self, other):
|
def __ne__(self, other):
|
||||||
return (self.get_name() != other.get_name() or
|
return (self.get_name() != other.get_name() or
|
||||||
self.get_country().lower() != other.get_country().lower())
|
self.get_country().casefold() != other.get_country().casefold())
|
||||||
|
|
||||||
def _get_params(self):
|
def _get_params(self):
|
||||||
return {'metro': self.get_name(), 'country': self.get_country()}
|
return {'metro': self.get_name(), 'country': self.get_country()}
|
||||||
|
@ -2802,10 +2802,10 @@ class Tag(_BaseObject, _Chartable):
|
||||||
return self.get_name()
|
return self.get_name()
|
||||||
|
|
||||||
def __eq__(self, other):
|
def __eq__(self, other):
|
||||||
return self.get_name().lower() == other.get_name().lower()
|
return self.get_name().casefold() == other.get_name().casefold()
|
||||||
|
|
||||||
def __ne__(self, other):
|
def __ne__(self, other):
|
||||||
return self.get_name().lower() != other.get_name().lower()
|
return self.get_name().casefold() != other.get_name().casefold()
|
||||||
|
|
||||||
def _get_params(self):
|
def _get_params(self):
|
||||||
return {self.ws_prefix: self.get_name()}
|
return {self.ws_prefix: self.get_name()}
|
||||||
|
@ -3026,7 +3026,7 @@ class Group(_BaseObject, _Chartable):
|
||||||
return self.get_name()
|
return self.get_name()
|
||||||
|
|
||||||
def __eq__(self, other):
|
def __eq__(self, other):
|
||||||
return self.get_name().lower() == other.get_name().lower()
|
return self.get_name().casefold() == other.get_name().casefold()
|
||||||
|
|
||||||
def __ne__(self, other):
|
def __ne__(self, other):
|
||||||
return self.get_name() != other.get_name()
|
return self.get_name() != other.get_name()
|
||||||
|
@ -4123,7 +4123,7 @@ def _extract_events_from_doc(doc, network):
|
||||||
def _url_safe(text):
|
def _url_safe(text):
|
||||||
"""Does all kinds of tricks on a text to make it safe to use in a url."""
|
"""Does all kinds of tricks on a text to make it safe to use in a url."""
|
||||||
|
|
||||||
return url_quote_plus(url_quote_plus(_string(text))).lower()
|
return url_quote_plus(url_quote_plus(_string(text))).casefold()
|
||||||
|
|
||||||
|
|
||||||
def _number(string):
|
def _number(string):
|
||||||
|
|
Loading…
Reference in a new issue