Various stylistic fixes

- Fix PEP8's line too long warning
- Remove useless parentheses
- Use triple quotes for docstring
- Address pylint's 'inconsistent-return-statements'
- Specify string format arguments as logging function parameters
- Comment out already disabled block of code
- Remove useless else (after return)
- Remove useless statement
- Do not import already imported module

whipper/program/cdparanoia.py

@@ -159,11 +159,10 @@ class ProgressParser:
             markEnd = frameOffset
 
         # FIXME: doing this is way too slow even for a testcase, so disable
-        if False:
-            for frame in range(markStart, markEnd):
-                if frame not in list(self._reads.keys()):
-                    self._reads[frame] = 0
-                self._reads[frame] += 1
+        # for frame in range(markStart, markEnd):
+        #     if frame not in list(self._reads.keys()):
+        #         self._reads[frame] = 0
+        #     self._reads[frame] += 1
 
         # cdparanoia reads quite a bit beyond the current track before it
         # goes back to verify; don't count those
@@ -300,7 +299,6 @@ class ReadTrackTask(task.Task):
                                          stderr=subprocess.PIPE,
                                          close_fds=True)
         except OSError as e:
-            import errno
             if e.errno == errno.ENOENT:
                 raise common.MissingDependencyException('cd-paranoia')
 

whipper/program/cdrdao.py

@@ -125,8 +125,8 @@ class ReadTOCTask(task.Task):
                 self._buffer = ""
             for line in lines:
                 self._parser.parse(line)
-                if (self._parser.currentTrack is not 0 and
-                        self._parser.tracks is not 0):
+                if (self._parser.currentTrack != 0 and
+                        self._parser.tracks != 0):
                     progress = (float('%d' % self._parser.currentTrack) /
                                 float(self._parser.tracks))
                     if progress < 1.0:

whipper/program/utils.py

@@ -28,7 +28,7 @@ def unmount_device(device):
     If the given device is a symlink, the target will be checked.
     """
     device = os.path.realpath(device)
-    logger.debug('possibly unmount real path %r' % device)
+    logger.debug('possibly unmount real path %r', device)
     proc = open('/proc/mounts').read()
     if device in proc:
         print('Device %s is mounted, unmounting' % device)