[SCM] morituri/master: pep8 fixes
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Oct 19 20:09:47 UTC 2014
The following commit has been merged in the master branch:
commit b86febb3b12bed18d6256042da77faf6da2fe5cf
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date: Sun Dec 2 16:40:46 2012 +0000
pep8 fixes
diff --git a/morituri/common/config.py b/morituri/common/config.py
index d85b91a..3d052a7 100644
--- a/morituri/common/config.py
+++ b/morituri/common/config.py
@@ -65,7 +65,6 @@ class Config(log.Loggable):
self.info('Loaded %d sections from config file' %
len(self._parser.sections()))
-
def setReadOffset(self, vendor, model, release, offset):
"""
Set a read offset for the given drive.
@@ -75,7 +74,8 @@ class Config(log.Loggable):
try:
section = self._findDriveSection(vendor, model, release)
except KeyError:
- section = 'drive:' + urllib.quote('%s:%s:%s' % (vendor, model, release))
+ section = 'drive:' + urllib.quote('%s:%s:%s' % (
+ vendor, model, release))
self._parser.add_section(section)
__pychecker__ = 'no-local'
read_offset = str(offset)
diff --git a/morituri/common/drive.py b/morituri/common/drive.py
index 8037efb..80c3de6 100644
--- a/morituri/common/drive.py
+++ b/morituri/common/drive.py
@@ -59,6 +59,7 @@ def _getAllDevicePathsStatic():
return ret
+
def getDeviceInfo(path):
try:
import cdio
@@ -69,4 +70,3 @@ def getDeviceInfo(path):
ok, vendor, model, release = device.get_hwinfo()
return (vendor, model, release)
-
diff --git a/morituri/common/program.py b/morituri/common/program.py
index afdb5c9..5d30dcf 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -65,7 +65,6 @@ class Program(log.Loggable):
'table')
return path
-
def loadDevice(self, device):
"""
Load the given device.
diff --git a/morituri/rip/cd.py b/morituri/rip/cd.py
index e2d2072..bab040f 100644
--- a/morituri/rip/cd.py
+++ b/morituri/rip/cd.py
@@ -136,7 +136,6 @@ Log files will log the path to tracks relative to this directory.
self.stdout.write("Using fallback read offset %d\n" %
options.offset)
-
def do(self, args):
prog = program.Program(record=self.getRootCommand().record)
runner = task.SyncRunner()
diff --git a/morituri/rip/offset.py b/morituri/rip/offset.py
index 03acdf6..43e3131 100644
--- a/morituri/rip/offset.py
+++ b/morituri/rip/offset.py
@@ -237,7 +237,6 @@ CD in the AccurateRip database."""
self.getRootCommand().config.setReadOffset(info[0], info[1], info[2],
offset)
-
class Offset(logcommand.LogCommand):
summary = "handle drive offsets"
diff --git a/morituri/test/test_common_config.py b/morituri/test/test_common_config.py
index 68d4c25..e587cf8 100644
--- a/morituri/test/test_common_config.py
+++ b/morituri/test/test_common_config.py
@@ -20,7 +20,7 @@ class OffsetTestCase(tcommon.TestCase):
os.unlink(self._path)
def testAddReadOffset(self):
- self.assertRaises(KeyError,
+ self.assertRaises(KeyError,
self._config.getReadOffset, 'PLEXTOR ', 'DVDR PX-L890SA', '1.05')
self._config.setReadOffset('PLEXTOR ', 'DVDR PX-L890SA', '1.05', 6)
--
morituri packaging
More information about the pkg-multimedia-commits
mailing list