Add a few extra .format() method call fixes

TODO

@@ -7511,7 +7511,8 @@
 ** TODO Convert old string formatting to new .format()-based formatting
    That is, instead of using: "foo %s bar" % (argument)
    it's better to use "foo {} bar".format(argument)
-   since the old string formatting is deprecated and not as powerful.
+   since the new format method is recommended for new code
+   and the old one is somewhat clunky and not as powerful.
 
    Since the old format sync is baked into some areas of the code
    (like the --format utility flags) it'll take longer to remove

audiotools/freedb.py

@@ -118,7 +118,7 @@ def __repr__(self):
                        for attr in ["offsets",
                                     "total_length",
                                     "track_count",
-                                    "playable_length"]])
+                                    "playable_length"]]))
 
     if sys.version_info[0] >= 3:
         def __str__(self):

audiotools/musicbrainz.py

@@ -105,13 +105,13 @@ def __unicode__(self):
         from hashlib import sha1
         from base64 import b64encode
 
-        raw_id = (u"{:02X}{:02X}{}".format(
-                  (self.first_track_number,
-                   self.last_track_number,
-                   u"".join([u"{:08X}".format(offset) for offset in
-                             [self.lead_out_offset] +
-                            self.offsets +
-                            [0] * (99 - len(self.offsets))])))
+        raw_id = u"{:02X}{:02X}{}".format(
+                  self.first_track_number,
+                  self.last_track_number,
+                  u"".join([u"{:08X}".format(offset) for offset in
+                            [self.lead_out_offset] +
+                           self.offsets +
+                           [0] * (99 - len(self.offsets))]))
 
         return b64encode(sha1(raw_id.encode("ascii")).digest(),
                          b"._").replace(b"=", b"-").decode('ascii')