cleanup

diff --git a/tools/mp3.py b/tools/mp3.py
index 6ad177b1a6ba7a672b8d9baca05a61f93085e0ef..c82ca93b19849c96969763d467763beba78e5f7e 100644 (file)
--- a/tools/mp3.py
+++ b/tools/mp3.py
@@ -44,7 +44,7 @@ from mutagen.mp3 import MP3
 EasyID3.valid_keys["comment"]="COMM::'XXX'"
 
 class Mp3:
-    """An MP3 file object"""
+    """A MP3 file object"""
     
     def __init__(self, media):
         self.media = media
@@ -60,7 +60,7 @@ class Mp3:
                     'comment': 'COMM',
                     'genre': 'TCON',
                     }
-        self.metadata = self.get_metadata()
+        self.metadata = self.get_file_metadata()
         self.description = self.get_description()
         self.mime_type = self.get_mime_type()
         self.extension = self.get_file_extension()
@@ -80,7 +80,7 @@ class Mp3:
     def get_description(self):
         return "MPEG audio Layer III"
     
-    def get_metadata(self):
+    def get_file_metadata(self):
         m = MP3(self.media, ID3=EasyID3)
         metadata = {}
         for key in self.keys2id3.keys():

diff --git a/tools/ogg.py b/tools/ogg.py
index 29fbbed4018f028823b1fcf022639a66a1c04f35..70b97c6e0571c8c5d4ba2fb86ab5b4f95f8fe771 100644 (file)
--- a/tools/ogg.py
+++ b/tools/ogg.py
@@ -41,7 +41,7 @@ import string
 from mutagen.oggvorbis import OggVorbis
 
 class Ogg:
-    """Defines methods to export to OGG Vorbis"""
+    """An OGG file object"""
     
     def __init__(self, media):
         self.item_id = ''