Packman Build Service PMBS

File audiotools.patch of Package audiotools (Revision 7)

Currently displaying revision 7 , Show latest

--- a/audiotools/__init__.py
+++ b/audiotools/__init__.py
@@ -497,19 +497,19 @@ def hex_string(byte_string):
 class output_text(tuple):
     """a class for formatting unicode strings for display"""
 
-    COLORS = {"black",
+    COLORS = ["black",
               "red",
               "green",
               "yellow",
               "blue",
               "magenta",
               "cyan",
-              "white"}
+              "white"]
 
-    STYLES = {"bold",
+    STYLES = ["bold",
               "underline",
               "blink",
-              "inverse"}
+              "inverse"]
 
     def __new__(cls, unicode_string, fg_color=None, bg_color=None, style=None):
         """unicode_string is the text to be displayed
@@ -1085,7 +1085,7 @@ class output_table(object):
             # no rows, so do nothing
             return
 
-        row_columns = {len(r) for r in self.__rows__ if not r.blank()}
+        row_columns = [len(r) for r in self.__rows__ if not r.blank()]
 
         if len(row_columns) == 0:
             # all rows are blank
@@ -1172,7 +1172,7 @@ class output_table_row(output_table_divi
 
         alignment may be 'left', 'center', 'right'"""
 
-        if alignment not in {"left", "center", "right"}:
+        if alignment not in ["left", "center", "right"]:
             raise ValueError("alignment must be 'left', 'center', or 'right'")
         if colspan == 1:
             self.__columns__.append(output_table_col(text, alignment))
@@ -1729,7 +1729,7 @@ def file_type(file):
         return WaveAudio
     elif ((len(header) >= 10) and
           (header[0:3] == b"ID3") and
-          (header[3:4] in {b"\x02", b"\x03", b"\x04"})):
+          (header[3:4] in [b"\x02", b"\x03", b"\x04"])):
         # file contains ID3v2 tag
         # so it may be MP3, MP2, FLAC or TTA
 
@@ -2759,15 +2759,15 @@ class PCMCat(PCMReader):
             from audiotools.text import ERR_NO_PCMREADERS
             raise ValueError(ERR_NO_PCMREADERS)
 
-        if len({r.sample_rate for r in self.pcmreaders}) != 1:
+        if len([r.sample_rate for r in self.pcmreaders]) != 1:
             from audiotools.text import ERR_SAMPLE_RATE_MISMATCH
             raise ValueError(ERR_SAMPLE_RATE_MISMATCH)
 
-        if len({r.channels for r in self.pcmreaders}) != 1:
+        if len([r.channels for r in self.pcmreaders]) != 1:
             from audiotools.text import ERR_CHANNEL_COUNT_MISMATCH
             raise ValueError(ERR_CHANNEL_COUNT_MISMATCH)
 
-        if len({r.bits_per_sample for r in self.pcmreaders}) != 1:
+        if len([r.bits_per_sample for r in self.pcmreaders]) != 1:
             from audiotools.text import ERR_BPS_MISMATCH
             raise ValueError(ERR_BPS_MISMATCH)
 
--- a/audiotools/ape.py
+++ b/audiotools/ape.py
@@ -366,9 +366,9 @@ class ApeTag(MetaData):
     def __getattr__(self, attr):
         if attr in self.ATTRIBUTE_MAP:
             try:
-                if attr in {'track_number', 'album_number'}:
+                if attr in ['track_number', 'album_number']:
                     return self[self.ATTRIBUTE_MAP[attr]].number()
-                elif attr in {'track_total', 'album_total'}:
+                elif attr in ['track_total', 'album_total']:
                     return self[self.ATTRIBUTE_MAP[attr]].total()
                 elif attr == 'compilation':
                     return self[self.ATTRIBUTE_MAP[attr]].__unicode__() == u"1"
@@ -399,7 +399,7 @@ class ApeTag(MetaData):
         if attr in self.ATTRIBUTE_MAP:
             key = self.ATTRIBUTE_MAP[attr]
             if value is not None:
-                if attr in {'track_number', 'album_number'}:
+                if attr in ['track_number', 'album_number']:
                     try:
                         current_value = self[key].__unicode__()
                         self[key] = self.ITEM.string(
@@ -407,7 +407,7 @@ class ApeTag(MetaData):
                     except KeyError:
                         self[key] = self.ITEM.string(
                             key, __number_pair__(value, None))
-                elif attr in {'track_total', 'album_total'}:
+                elif attr in ['track_total', 'album_total']:
                     try:
                         current_value = self[key].__unicode__()
                         self[key] = self.ITEM.string(
@@ -434,7 +434,7 @@ class ApeTag(MetaData):
         if attr in self.ATTRIBUTE_MAP:
             key = self.ATTRIBUTE_MAP[attr]
 
-            if attr in {'track_number', 'album_number'}:
+            if attr in ['track_number', 'album_number']:
                 try:
                     tag = self[key]
                     if tag.total() is None:
@@ -447,7 +447,7 @@ class ApeTag(MetaData):
                 except KeyError:
                     # no tag to delete
                     pass
-            elif attr in {'track_total', 'album_total'}:
+            elif attr in ['track_total', 'album_total']:
                 try:
                     tag = self[key]
                     if tag.total() is not None:
@@ -1034,8 +1034,8 @@ class ApeGainedAudio(object):
         if metadata is None:
             return None
 
-        if ({b'replaygain_track_gain', b'replaygain_track_peak',
-             b'replaygain_album_gain', b'replaygain_album_peak'}.issubset(
+        if ([b'replaygain_track_gain', b'replaygain_track_peak',
+             b'replaygain_album_gain', b'replaygain_album_peak'].issubset(
                 metadata.keys())):  # we have ReplayGain data
             try:
                 return ReplayGain(
--- a/audiotools/id3.py
+++ b/audiotools/id3.py
@@ -1342,9 +1342,9 @@ class ID3v22Comment(MetaData):
         if attr in self.ATTRIBUTE_MAP:
             try:
                 frame = self[self.ATTRIBUTE_MAP[attr]][0]
-                if attr in {'track_number', 'album_number'}:
+                if attr in ['track_number', 'album_number']:
                     return frame.number()
-                elif attr in {'track_total', 'album_total'}:
+                elif attr in ['track_total', 'album_total']:
                     return frame.total()
                 elif attr == 'compilation':
                     return frame.true()
@@ -1374,7 +1374,7 @@ class ID3v22Comment(MetaData):
             if value is not None:
                 frame_id = self.ATTRIBUTE_MAP[attr]
 
-                if attr in {'track_number', 'album_number'}:
+                if attr in ['track_number', 'album_number']:
                     try:
                         new_frame = self.TEXT_FRAME.converted(
                             frame_id,
@@ -1387,7 +1387,7 @@ class ID3v22Comment(MetaData):
                         new_frame = self.TEXT_FRAME.converted(
                             frame_id,
                             __padded__(value))
-                elif attr in {'track_total', 'album_total'}:
+                elif attr in ['track_total', 'album_total']:
                     try:
                         new_frame = self.TEXT_FRAME.converted(
                             frame_id,
@@ -1433,7 +1433,7 @@ class ID3v22Comment(MetaData):
             delete_frame_id = self.ATTRIBUTE_MAP[attr]
             for frame in self:
                 if frame.id == delete_frame_id:
-                    if attr in {'track_number', 'album_number'}:
+                    if attr in ['track_number', 'album_number']:
                         current_value = frame.__unicode__()
                         if u"/" in current_value:
                             # if *_number field contains a slashed total,
@@ -1445,7 +1445,7 @@ class ID3v22Comment(MetaData):
                         else:
                             # otherwise, remove *_number field
                             continue
-                    elif attr in {'track_total', 'album_total'}:
+                    elif attr in ['track_total', 'album_total']:
                         current_value = frame.__unicode__()
                         if u"/" in current_value:
                             (first, second) = current_value.split(u"/", 1)
--- a/audiotools/vorbiscomment.py
+++ b/audiotools/vorbiscomment.py
@@ -217,7 +217,7 @@ class VorbisComment(MetaData):
                 except KeyError:
                     # if no TRACKNUMBER/DISCNUMBER, return None
                     return None
-            elif attr in {'track_total', 'album_total'}:
+            elif attr in ['track_total', 'album_total']:
                 try:
                     # get the TRACKTOTAL/DISCTOTAL values
                     # return the first value that contains an integer
@@ -289,7 +289,7 @@ class VorbisComment(MetaData):
         elif attr in self.ATTRIBUTE_MAP:
             key = self.ATTRIBUTE_MAP[attr]
 
-            if attr in {'track_number', 'album_number'}:
+            if attr in ['track_number', 'album_number']:
                 try:
                     current_values = self[key]
                     for i in range(len(current_values)):
@@ -313,7 +313,7 @@ class VorbisComment(MetaData):
                 except KeyError:
                     # no current field with key, so add new one
                     self[key] = [u"%d" % (value)]
-            elif attr in {'track_total', 'album_total'}:
+            elif attr in ['track_total', 'album_total']:
                 # look for standalone TRACKTOTAL/DISCTOTAL field
                 try:
                     current_values = self[key]
@@ -381,7 +381,7 @@ class VorbisComment(MetaData):
         if attr in self.ATTRIBUTE_MAP:
             key = self.ATTRIBUTE_MAP[attr]
 
-            if attr in {'track_number', 'album_number'}:
+            if attr in ['track_number', 'album_number']:
                 try:
                     current_values = self[key]
 
@@ -407,7 +407,7 @@ class VorbisComment(MetaData):
                 except KeyError:
                     # no TRACKNUMBER/DISCNUMBER field to remove
                     pass
-            elif attr in {'track_total', 'album_total'}:
+            elif attr in ['track_total', 'album_total']:
                 def slash_filter(unicode_string):
                     if u"/" not in unicode_string:
                         return unicode_string