diff --git a/beetsplug/beatport.py b/beetsplug/beatport.py index 908398d99..8a80fb5ac 100644 --- a/beetsplug/beatport.py +++ b/beetsplug/beatport.py @@ -68,7 +68,7 @@ class BeatportSearch(object): release_type = None def __unicode__(self): - return u"".format( + return u"".format( self.release_type, self.query, len(self.results)) def __init__(self, query, release_type='release', details=True): @@ -76,7 +76,7 @@ class BeatportSearch(object): self.query = query self.release_type = release_type response = BeatportAPI.get('catalog/3/search', query=query, - facets=['fieldType:{}' + facets=['fieldType:{0}' .format(release_type)], perPage=5) for item in response: @@ -97,8 +97,10 @@ class BeatportRelease(BeatportObject): artist_str = ", ".join(x[1] for x in self.artists) else: artist_str = "Various Artists" - return u"".format(artist_str, self.name, - self.catalog_number) + return u"".format( + artist_str, self.name, + self.catalog_number + ) def __init__(self, data): BeatportObject.__init__(self, data) @@ -109,7 +111,7 @@ class BeatportRelease(BeatportObject): if 'category' in data: self.category = data['category'] if 'slug' in data: - self.url = "http://beatport.com/release/{}/{}".format( + self.url = "http://beatport.com/release/{0}/{1}".format( data['slug'], data['id']) @classmethod @@ -129,8 +131,8 @@ class BeatportTrack(BeatportObject): def __unicode__(self): artist_str = ", ".join(x[1] for x in self.artists) - return u"".format(artist_str, self.name, - self.mix_name) + return u"".format( + artist_str, self.name, self.mix_name) def __init__(self, data): BeatportObject.__init__(self, data) @@ -141,7 +143,7 @@ class BeatportTrack(BeatportObject): if 'length' in data: self.length = timedelta(milliseconds=data['lengthMs']) if 'slug' in data: - self.url = "http://beatport.com/track/{}/{}".format( + self.url = "http://beatport.com/track/{0}/{1}".format( data['slug'], data['id']) @classmethod @@ -202,7 +204,7 @@ class BeatportPlugin(BeetsPlugin): or None if the release is not found. """ log.debug('Searching Beatport for release %s' % str(release_id)) - match = re.search(r'(^|beatport\.com/release/.+/)(\d+)$', release_id) + match = re.search(r'(^|beatport\.com/release/.+/)(\d+)$', release_id) if not match: return None release = BeatportRelease.from_id(match.group(2)) @@ -214,7 +216,7 @@ class BeatportPlugin(BeetsPlugin): or None if the track is not found. """ log.debug('Searching Beatport for track %s' % str(track_id)) - match = re.search(r'(^|beatport\.com/track/.+/)(\d+)$', track_id) + match = re.search(r'(^|beatport\.com/track/.+/)(\d+)$', track_id) if not match: return None bp_track = BeatportTrack.from_id(match.group(2)) @@ -261,7 +263,7 @@ class BeatportPlugin(BeetsPlugin): """ title = track.name if track.mix_name != u"Original Mix": - title += u" ({})".format(track.mix_name) + title += u" ({0})".format(track.mix_name) artist, artist_id = self._get_artist(track.artists) length = track.length.total_seconds()