From 1ae6240e638e592534676d0e9d4dcef944774602 Mon Sep 17 00:00:00 2001 From: JoeLametta Date: Fri, 29 Mar 2019 13:30:44 +0100 Subject: [PATCH] Remove useless "stopgap morituri-insanity compatibility layer" Signed-off-by: JoeLametta --- whipper/command/cd.py | 2 +- whipper/common/program.py | 2 +- whipper/program/cdrdao.py | 7 ------- whipper/test/test_program_cdrdao.py | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/whipper/command/cd.py b/whipper/command/cd.py index f32c115..99cdefb 100644 --- a/whipper/command/cd.py +++ b/whipper/command/cd.py @@ -163,7 +163,7 @@ class _CD(BaseCommand): # result - self.program.result.cdrdaoVersion = cdrdao.getCDRDAOVersion() + self.program.result.cdrdaoVersion = cdrdao.version() self.program.result.cdparanoiaVersion = \ cdparanoia.getCdParanoiaVersion() info = drive.getDeviceInfo(self.device) diff --git a/whipper/common/program.py b/whipper/common/program.py index 223ed95..35509a6 100644 --- a/whipper/common/program.py +++ b/whipper/common/program.py @@ -92,7 +92,7 @@ class Program: Also warn about buggy cdrdao versions. """ from pkg_resources import parse_version as V - version = cdrdao.getCDRDAOVersion() + version = cdrdao.version() if V(version) < V('1.2.3rc2'): logger.warning('cdrdao older than 1.2.3 has a pre-gap length bug.' ' See http://sourceforge.net/tracker/?func=detail&aid=604751&group_id=2171&atid=102171') # noqa: E501 diff --git a/whipper/program/cdrdao.py b/whipper/program/cdrdao.py index 8bfad7f..b9b3687 100644 --- a/whipper/program/cdrdao.py +++ b/whipper/program/cdrdao.py @@ -188,10 +188,3 @@ def version(): "could not find version") return None return m.group('version') - - -def getCDRDAOVersion(): - """ - stopgap morituri-insanity compatibility layer - """ - return version() diff --git a/whipper/test/test_program_cdrdao.py b/whipper/test/test_program_cdrdao.py index 0655c61..0bbd60c 100644 --- a/whipper/test/test_program_cdrdao.py +++ b/whipper/test/test_program_cdrdao.py @@ -9,7 +9,7 @@ from whipper.test import common class VersionTestCase(common.TestCase): def testGetVersion(self): - v = cdrdao.getCDRDAOVersion() + v = cdrdao.version() self.assertTrue(v) # make sure it starts with a digit self.assertTrue(int(v[0]))