Skip to content

Commit

Permalink
Remove dead code from program.getFastToc
Browse files Browse the repository at this point in the history
The caching mechanism didn's have any effect. The inline function
'function' wasn't used anymore.
  • Loading branch information
mtdcr committed May 7, 2018
1 parent db8050d commit 7325157
Showing 1 changed file with 9 additions and 16 deletions.
25 changes: 9 additions & 16 deletions whipper/common/program.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,23 +90,16 @@ def setWorkingDirectory(self, workingDirectory):
os.chdir(workingDirectory)

def getFastToc(self, runner, device):
"""Retrieve the normal TOC table from a toc pickle or the drive.
Also retrieves the cdrdao version
"""Retrieve the normal TOC table from the drive.
Also warn about buggy cdrdao versions.
"""
def function(r, t):
r.run(t)

ptoc = cache.Persister()
if not ptoc.object:
from pkg_resources import parse_version as V
version = cdrdao.getCDRDAOVersion()
if V(version) < V('1.2.3rc2'):
sys.stdout.write('Warning: cdrdao older than 1.2.3 has a '
'pre-gap length bug.\n'
'See http://sourceforge.net/tracker/?func=detail&aid=604751&group_id=2171&atid=102171\n') # noqa: E501
t = cdrdao.ReadTOCTask(device)
ptoc.persist(t.table)
toc = ptoc.object
from pkg_resources import parse_version as V
version = cdrdao.getCDRDAOVersion()
if V(version) < V('1.2.3rc2'):
sys.stdout.write('Warning: cdrdao older than 1.2.3 has a '
'pre-gap length bug.\n'
'See http://sourceforge.net/tracker/?func=detail&aid=604751&group_id=2171&atid=102171\n') # noqa: E501
toc = cdrdao.ReadTOCTask(device).table
assert toc.hasTOC()
return toc

Expand Down

0 comments on commit 7325157

Please sign in to comment.