@@ -401,4 +401,4 @@ For example, deleting the "track_name" field would delete a Vorbis comment's "TITLE" field. Or, deleting the MetaData from MP3 would remove all the ID3v2/ID3v1 tags. - +** DONE Add delattr to ID3v1 TODO @@ -575,7 +575,7 @@ class FlacAudio(AudioFile): def set_metadata(self, metadata): metadata = FlacMetaData.converted(metadata) - if (metadata == None): return + if (metadata is None): return #port over the old STREAMINFO and SEEKTABLE blocks old_metadata = self.get_metadata() @@ -1012,7 +1012,7 @@ class OggFlacAudio(FlacAudio): comment = FlacMetaData.converted(metadata) #port over the old STREAMINFO and SEEKTABLE blocks - if (comment == None): return + if (comment is None): return old_metadata = self.get_metadata() old_streaminfo = old_metadata.streaminfo old_seektable = old_metadata.seektable audiotools/__flac__.py @@ -318,7 +318,7 @@ class DiscID: self.tracks.append(track) def offsets(self): - if (self.__offsets__ == None): + if (self.__offsets__ is None): offsets = [self.__lead_in__] for track in self.tracks[0:-1]: @@ -329,7 +329,7 @@ class DiscID: return self.__offsets__ def length(self): - if (self.__length__ == None): + if (self.__length__ is None): return sum(self.tracks) else: return self.__length__ @@ -430,7 +430,7 @@ class FreeDB: self.socket.close() def write(self, line): - if (self.socket != None): + if (self.socket is not None): self.w.write(line) self.w.write("\r\n") self.w.flush() @@ -492,7 +492,7 @@ class FreeDBWeb(FreeDB): self.connection = httplib.HTTPConnection(self.server,self.port) def close(self): - if (self.connection != None): + if (self.connection is not None): self.connection.close() def write(self, line): audiotools/__freedb__.py @@ -1454,7 +1454,7 @@ class ID3CommentPair(MetaData): self.id3v1.merge(metadata) def __unicode__(self): - if ((self.id3v2 != None) and (self.id3v1 != None)): + if ((self.id3v2 is not None) and (self.id3v1 is not None)): #both comments present return unicode(self.id3v2) + \ (os.linesep * 2) + \ audiotools/__id3__.py @@ -164,4 +164,7 @@ class ID3v1Comment(MetaData,list): self.comment, self.track_number) + def images(self): + return [] + audiotools/__id3v1__.py @@ -100,7 +100,7 @@ FILENAME_FORMAT = config.get_default( FS_ENCODING = config.get_default("System","fs_encoding", sys.getfilesystemencoding()) -if (FS_ENCODING == None): +if (FS_ENCODING is None): FS_ENCODING = 'UTF-8' IO_ENCODING = config.get_default("System","io_encoding","UTF-8") @@ -447,7 +447,7 @@ class PCMReader: def close(self): self.file.close() - if (self.process != None): + if (self.process is not None): if (self.process.wait() != 0): raise DecodingError() @@ -1703,7 +1703,7 @@ class AudioFile: #if we come up empty, returns 0 def track_number(self): metadata = self.get_metadata() - if ((metadata != None) and (metadata.track_number > 0)): + if ((metadata is not None) and (metadata.track_number > 0)): return metadata.track_number else: try: @@ -1718,7 +1718,7 @@ class AudioFile: #if we come up empty, returns 0 def album_number(self): metadata = self.get_metadata() - if (metadata != None): + if (metadata is not None): return metadata.album_number else: try: @@ -1956,7 +1956,7 @@ class RawCDDA: import cdio self.cdda = cdio.CDDA(device_name) self.total_tracks = self.cdda.total_tracks() - if (speed != None): + if (speed is not None): self.cdda.set_speed(speed) def __len__(self): @@ -1994,7 +1994,7 @@ class OffsetCDDA(RawCDDA): self.cdda = cdio.CDDA(device_name) self.total_tracks = self.cdda.total_tracks() - if (speed != None): + if (speed is not None): self.cdda.set_speed(speed) self.__temp__ = tempfile.TemporaryFile() @@ -2202,7 +2202,7 @@ class ExecQueue: if (pid > 0): #parent return pid else: #child - if (kwargs != None): + if (kwargs is not None): function(*args,**kwargs) else: function(*args) audiotools/__init__.py @@ -73,7 +73,7 @@ class __Qt_Atom__: elif (self.is_container()): for atom in self: returned_atom = atom.get_atom(type) - if (returned_atom != None): + if (returned_atom is not None): return returned_atom return None audiotools/__m4a__.py @@ -440,7 +440,7 @@ class MP3Audio(AudioFile): layer = 4 - header.layer #layer 1, 2 or 3 bit_rate = MP3Audio.__get_mp3_frame_bitrate__(header) - if (bit_rate == None): raise MP3Exception(_(u"Invalid bit rate")) + if (bit_rate is None): raise MP3Exception(_(u"Invalid bit rate")) sample_rate = MP3Audio.__get_mp3_frame_sample_rate__(header) audiotools/__mp3__.py @@ -65,7 +65,7 @@ class WaveReader(PCMReader): def close(self): self.wave.close() - if (self.process != None): + if (self.process is not None): self.process.wait() class TempWaveReader(WaveReader): audiotools/__wav__.py @@ -122,7 +122,7 @@ if (__name__ == '__main__'): msg.error(_(u"Audio type %s has no compression modes") % \ (AudioType.NAME)) sys.exit(0) - elif (options.quality == None): + elif (options.quality is None): options.quality = AudioType.DEFAULT_COMPRESSION elif (options.quality not in AudioType.COMPRESSION_MODES): msg.error(_(u"\"%(quality)s\" is not a supported compression mode for type \"%(type)s\"") % \ @@ -132,7 +132,7 @@ if (__name__ == '__main__'): #if we're using an XMCD file, use that file for MetaData - if (options.xmcd != None): + if (options.xmcd is not None): try: xmcd = audiotools.XMCD.read(options.xmcd).metadata() except audiotools.XMCDException: cd2track @@ -356,7 +356,7 @@ if (__name__ == '__main__'): try: metadata = audiofile.get_metadata() - if ((metadata != None) and + if ((metadata is not None) and (len(metadata.images()) > 0)): for image in metadata.images(): cover_list.append((audiofile.filename,image)) coverview @@ -175,7 +175,7 @@ if (__name__ == '__main__'): msg.error(_(u"Audio type %s has no compression modes") % \ (AudioType.NAME)) sys.exit(0) - elif (options.quality == None): + elif (options.quality is None): options.quality = AudioType.DEFAULT_COMPRESSION elif (options.quality not in AudioType.COMPRESSION_MODES): msg.error(_(u"\"%(quality)s\" is not a supported compression mode for type \"%(type)s\"") % \ record2track @@ -221,7 +221,7 @@ if (__name__ == '__main__'): msg.error(_(u"Audio type %s has no compression modes") % \ (AudioType.NAME)) sys.exit(0) - elif (options.quality == None): + elif (options.quality is None): options.quality = AudioType.DEFAULT_COMPRESSION elif (options.quality not in AudioType.COMPRESSION_MODES): msg.error(_(u"\"%(quality)s\" is not a supported compression mode for type \"%(type)s\"") % \ @@ -239,14 +239,14 @@ if (__name__ == '__main__'): msg.error(_(u'You must run at least 1 process at a time')) sys.exit(1) - if ((options.output != None) and + if ((options.output is not None) and (len(audiofiles) != 1)): msg.error(_(u'You may specify only 1 input file for use with -o')) sys.exit(1) #if we're using an XMCD file, use that file for MetaData - if (options.xmcd != None): + if (options.xmcd is not None): try: xmcd = audiotools.XMCD.read(options.xmcd).metadata() except audiotools.XMCDException: @@ -274,7 +274,7 @@ if (__name__ == '__main__'): max_processes = options.max_processes - if (options.output == None): + if (options.output is None): #the default encoding method, without an output file base_directory = options.dir track2track @@ -58,7 +58,7 @@ if (__name__ == '__main__'): (options,args) = parser.parse_args() msg = audiotools.Messenger("trackcat",options) - if (options.filename == None): + if (options.filename is None): msg.error(_(u'You must specify an output file')) sys.exit(1) @@ -83,7 +83,7 @@ if (__name__ == '__main__'): msg.error(_(u"Audio type %s has no compression modes") % \ (AudioType.NAME)) sys.exit(0) - elif (options.quality == None): + elif (options.quality is None): options.quality = AudioType.DEFAULT_COMPRESSION elif (options.quality not in AudioType.COMPRESSION_MODES): msg.error(_(u"\"%(quality)s\" is not a supported compression mode for type \"%(type)s\"") % \ trackcat @@ -156,7 +156,7 @@ if (__name__ == '__main__'): msg.error(_(u"Audio type %s has no compression modes") % \ (AudioType.NAME)) sys.exit(0) - elif (options.quality == None): + elif (options.quality is None): options.quality = AudioType.DEFAULT_COMPRESSION elif (options.quality not in AudioType.COMPRESSION_MODES): msg.error(_(u"\"%(quality)s\" is not a supported compression mode for type \"%(type)s\"") % \ @@ -221,7 +221,7 @@ if (__name__ == '__main__'): for (i,indexes) in enumerate(cuesheet.indexes())]) #if we're using an XMCD file, use that file for track MetaData - if (options.xmcd != None): + if (options.xmcd is not None): try: xmcd = audiotools.XMCD.read(options.xmcd).metadata() except audiotools.XMCDException: tracksplit 5fd44d96a006262a884aaf67b8b353180b81333c Brian Langenberger bjl@usa.net http://github.com/tuffy/python-audio-tools/commit/d128c2f502edbafb18ad57f9f51d498a573694c9 d128c2f502edbafb18ad57f9f51d498a573694c9 2009-08-31T10:55:25-07:00 2009-08-31T10:55:25-07:00 Add dummy images() method to ID3v1Comment. Convert instances of "== None" and "!= None" to "is None" and "is not None" e8e6199255bc7f5d3d3774142aa5f7e4986ac16d Brian Langenberger bjl@usa.net