From 69b8de4876ae54f7787abc015b544d7aadea98dd Mon Sep 17 00:00:00 2001
From: jvoisin
Date: Fri, 12 Apr 2013 18:16:39 +0200
Subject: Enforce consistency between classname and filename

---
 MAT/audio.py           |  6 +++---
 MAT/mutagenpowered.py  | 35 -----------------------------------
 MAT/mutagenstripper.py | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 MAT/mutagenpowered.py
 create mode 100644 MAT/mutagenstripper.py

(limited to 'MAT')

diff --git a/MAT/audio.py b/MAT/audio.py
index 4df33dd..3c6c7bc 100644
--- a/MAT/audio.py
+++ b/MAT/audio.py
@@ -9,7 +9,7 @@ except ImportError:
     pass
 
 import parser
-import mutagenpowered
+import mutagenstripper
 
 
 class MpegAudioStripper(parser.GenericParser):
@@ -20,7 +20,7 @@ class MpegAudioStripper(parser.GenericParser):
         return field.name in ("id3v1", "id3v2")
 
 
-class OggStripper(mutagenpowered.MutagenStripper):
+class OggStripper(mutagenstripper.MutagenStripper):
     '''
         Represent an ogg vorbis file
     '''
@@ -28,7 +28,7 @@ class OggStripper(mutagenpowered.MutagenStripper):
         self.mfile = OggVorbis(self.filename)
 
 
-class FlacStripper(mutagenpowered.MutagenStripper):
+class FlacStripper(mutagenstripper.MutagenStripper):
     '''
         Represent a Flac audio file
     '''
diff --git a/MAT/mutagenpowered.py b/MAT/mutagenpowered.py
deleted file mode 100644
index d44bbdb..0000000
--- a/MAT/mutagenpowered.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import parser
-import shutil
-
-
-class MutagenStripper(parser.GenericParser):
-    def __init__(self, filename, parser, mime, backup, **kwargs):
-        super(MutagenStripper, self).__init__(filename, parser, mime, backup, **kwargs)
-        self._create_mfile()
-
-    def _create_mfile(self):
-        raise NotImplemented
-
-    def is_clean(self):
-        return not self.mfile.tags
-
-    def remove_all(self):
-        if self.backup:
-            shutil.copy2(self.filename, self.output)
-            self.mfile.filename = self.output
-        else:
-            self.mfile.filename = self.filename
-
-        self.mfile.delete()
-        self.mfile.save()
-        return True
-
-    def get_meta(self):
-        '''
-            Return the content of the metadata block is present
-        '''
-        metadata = {}
-        if self.mfile.tags:
-            for key, value in self.mfile.tags:
-                metadata[key] = value
-        return metadata
diff --git a/MAT/mutagenstripper.py b/MAT/mutagenstripper.py
new file mode 100644
index 0000000..d44bbdb
--- /dev/null
+++ b/MAT/mutagenstripper.py
@@ -0,0 +1,35 @@
+import parser
+import shutil
+
+
+class MutagenStripper(parser.GenericParser):
+    def __init__(self, filename, parser, mime, backup, **kwargs):
+        super(MutagenStripper, self).__init__(filename, parser, mime, backup, **kwargs)
+        self._create_mfile()
+
+    def _create_mfile(self):
+        raise NotImplemented
+
+    def is_clean(self):
+        return not self.mfile.tags
+
+    def remove_all(self):
+        if self.backup:
+            shutil.copy2(self.filename, self.output)
+            self.mfile.filename = self.output
+        else:
+            self.mfile.filename = self.filename
+
+        self.mfile.delete()
+        self.mfile.save()
+        return True
+
+    def get_meta(self):
+        '''
+            Return the content of the metadata block is present
+        '''
+        metadata = {}
+        if self.mfile.tags:
+            for key, value in self.mfile.tags:
+                metadata[key] = value
+        return metadata
-- 
cgit v1.3