Update string formatting from % to .format()

README.mkd

@@ -51,7 +51,7 @@ Now you can make requests on behalf of the user.
 
 ```python
 >>> me = d.identity()
->>> "I'm %s (%s) from %s." % (me.name, me.username, me.location)
+>>> "I'm {} ({}) from {}.".format(me.name, me.username, me.location)
 u"I'm Joe Bloggs (example) from Portland, Oregon."
 >>> len(me.wantlist)
 3

discogs_client/client.py

@@ -177,7 +177,7 @@ def order(self, id):
 
     def fee_for(self, price, currency='USD'):
         """Calculate the fee for selling an item on the Marketplace."""
-        resp = self._get(self._base_url + '/marketplace/fee/%0.4f/%s' % (float(price), currency))
+        resp = self._get('{}/marketplace/fee/{:.4f}/{}'.format(self._base_url, price, currency))
         return models.Price(self, {'value': resp['value'], 'currency': resp['currency']})
 
     def identity(self):

discogs_client/exceptions.py

@@ -19,7 +19,7 @@ class HTTPError(DiscogsAPIError):
     """Exception class for HTTP errors."""
     def __init__(self, message, code):
         self.status_code = code
-        self.msg = '%d: %s' % (code, message)
+        self.msg = '{}: {}'.format(code, message)
 
     def __str__(self):
         return self.msg

discogs_client/models.py

@@ -443,14 +443,14 @@ class Artist(PrimaryAPIObject):
 
     def __init__(self, client, dict_):
         super(Artist, self).__init__(client, dict_)
-        self.data['resource_url'] = client._base_url + '/artists/%d' % dict_['id']
+        self.data['resource_url'] = '{}/artists/{}'.format(client._base_url, dict_['id'])
 
     @property
     def releases(self):
         return MixedPaginatedList(self.client, self.fetch('releases_url'), 'releases')
 
     def __repr__(self):
-        return '<Artist %r %r>' % (self.id, self.name)
+        return '<Artist {} {}>'.format(self.id, self.name)
 
 
 class Release(PrimaryAPIObject):
@@ -476,7 +476,7 @@ class Release(PrimaryAPIObject):
 
     def __init__(self, client, dict_):
         super(Release, self).__init__(client, dict_)
-        self.data['resource_url'] = client._base_url + '/releases/%d' % dict_['id']
+        self.data['resource_url'] = '{}/releases/{}'.format(client._base_url, dict_['id'])
 
     @property
     def master(self):
@@ -487,7 +487,7 @@ def master(self):
             return None
 
     def __repr__(self):
-        return '<Release %r %r>' % (self.id, self.title)
+        return '<Release {} {}>'.format(self.id, self.title)
 
 
 class Master(PrimaryAPIObject):
@@ -505,10 +505,10 @@ class Master(PrimaryAPIObject):
 
     def __init__(self, client, dict_):
         super(Master, self).__init__(client, dict_)
-        self.data['resource_url'] = client._base_url + '/masters/%d' % dict_['id']
+        self.data['resource_url'] = '{}/masters/{}'.format(client._base_url, dict_['id'])
 
     def __repr__(self):
-        return '<Master %r %r>' % (self.id, self.title)
+        return '<Master {} {}>'.format(self.id, self.title)
 
 
 class Label(PrimaryAPIObject):
@@ -526,10 +526,10 @@ class Label(PrimaryAPIObject):
 
     def __init__(self, client, dict_):
         super(Label, self).__init__(client, dict_)
-        self.data['resource_url'] = client._base_url + '/labels/%d' % dict_['id']
+        self.data['resource_url'] = '{}/labels/{}'.format(client._base_url, dict_['id'])
 
     def __repr__(self):
-        return '<Label %r %r>' % (self.id, self.name)
+        return '<Label {} {}>'.format(self.id, self.name)
 
 
 class User(PrimaryAPIObject):
@@ -552,7 +552,7 @@ class User(PrimaryAPIObject):
 
     def __init__(self, client, dict_):
         super(User, self).__init__(client, dict_)
-        self.data['resource_url'] = client._base_url + '/users/%s' % dict_['username']
+        self.data['resource_url'] = '{}/users/{}'.format(client._base_url, dict_['username'])
 
     @property
     def orders(self):
@@ -564,7 +564,7 @@ def collection_folders(self):
         return [CollectionFolder(self.client, d) for d in resp['folders']]
 
     def __repr__(self):
-        return '<User %r %r>' % (self.id, self.username)
+        return '<User {} {}>'.format(self.id, self.username)
 
 
 class WantlistItem(PrimaryAPIObject):
@@ -578,7 +578,7 @@ def __init__(self, client, dict_):
         super(WantlistItem, self).__init__(client, dict_)
 
     def __repr__(self):
-        return '<WantlistItem %r %r>' % (self.id, self.release.title)
+        return '<WantlistItem {} {}>'.format(self.id, self.release.title)
 
 
 # TODO: folder_id should be a Folder object; needs folder_url
@@ -594,7 +594,7 @@ def __init__(self, client, dict_):
         super(CollectionItemInstance, self).__init__(client, dict_)
 
     def __repr__(self):
-        return '<CollectionItemInstance %r %r>' % (self.id, self.release.title)
+        return '<CollectionItemInstance {} {}>'.format(self.id, self.release.title)
 
 
 class CollectionFolder(PrimaryAPIObject):
@@ -611,7 +611,7 @@ def releases(self):
         return PaginatedList(self.client, self.fetch('resource_url') + '/releases', 'releases', CollectionItemInstance)
 
     def __repr__(self):
-        return '<CollectionFolder %r %r>' % (self.id, self.name)
+        return '<CollectionFolder {} {}>'.format(self.id, self.name)
 
 
 class Listing(PrimaryAPIObject):
@@ -631,10 +631,10 @@ class Listing(PrimaryAPIObject):
 
     def __init__(self, client, dict_):
         super(Listing, self).__init__(client, dict_)
-        self.data['resource_url'] = client._base_url + '/marketplace/listings/%d' % dict_['id']
+        self.data['resource_url'] = '{}/marketplace/listings/{}'.format(client._base_url, dict_['id'])
 
     def __repr__(self):
-        return '<Listing %r %r>' % (self.id, self.release.data['description'])
+        return '<Listing {} {}>'.format(self.id, self.release.data['description'])
 
 
 class Order(PrimaryAPIObject):
@@ -654,7 +654,7 @@ class Order(PrimaryAPIObject):
 
     def __init__(self, client, dict_):
         super(Order, self).__init__(client, dict_)
-        self.data['resource_url'] = client._base_url + '/marketplace/orders/%s' % dict_['id']
+        self.data['resource_url'] = '{}/marketplace/orders/{}'.format(client._base_url, dict_['id'])
 
     # Setting shipping is a little weird -- you can't change the
     # currency, and you use the 'shipping' key instead of 'value'
@@ -667,7 +667,7 @@ def shipping(self, value):
         self.changes['shipping'] = value
 
     def __repr__(self):
-        return '<Order %r>' % self.id
+        return '<Order {}>'.format(self.id)
 
 
 class OrderMessage(SecondaryAPIObject):
@@ -678,7 +678,7 @@ class OrderMessage(SecondaryAPIObject):
     timestamp = SimpleField(transform=parse_timestamp)
 
     def __repr__(self):
-        return '<OrderMessage to:%r>' % self.to.username
+        return '<OrderMessage to:{}>'.format(self.to.username)
 
 
 class Track(SecondaryAPIObject):
@@ -689,15 +689,15 @@ class Track(SecondaryAPIObject):
     credits = ListField('Artist', key='extraartists')
 
     def __repr__(self):
-        return '<Track %r %r>' % (self.position, self.title)
+        return '<Track {} {}>'.format(self.position, self.title)
 
 
 class Price(SecondaryAPIObject):
     currency = SimpleField()
     value = SimpleField()
 
     def __repr__(self):
-        return '<Price %r %r>' % (self.value, self.currency)
+        return '<Price {} {}>'.format(self.value, self.currency)
 
 
 class Video(SecondaryAPIObject):
@@ -708,7 +708,7 @@ class Video(SecondaryAPIObject):
     url = SimpleField('uri')
 
     def __repr__(self):
-        return '<Video %r>' % (self.title)
+        return '<Video {}>'.format(self.title)
 
 CLASS_MAP = {
     'artist': Artist,