Remove useless "stopgap morituri-insanity compatibility layer"

Signed-off-by: JoeLametta <JoeLametta@users.noreply.github.com>
This commit is contained in:
JoeLametta
2019-03-29 13:30:44 +01:00
parent 135cc9ce05
commit 1ae6240e63
4 changed files with 3 additions and 10 deletions

View File

@@ -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)

View File

@@ -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

View File

@@ -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()

View File

@@ -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]))