diff options
| -rw-r--r-- | lib/portage/elog/mod_mail_summary.py | 2 | ||||
| -rw-r--r-- | lib/portage/emaint/modules/merges/merges.py | 4 | ||||
| -rw-r--r-- | lib/portage/package/ebuild/config.py | 2 | ||||
| -rw-r--r-- | lib/portage/tests/sets/shell/testShell.py | 2 | ||||
| -rw-r--r-- | lib/portage/util/futures/_asyncio/__init__.py | 10 | ||||
| -rw-r--r-- | lib/portage/util/futures/events.py | 22 | ||||
| -rw-r--r-- | lib/portage/util/whirlpool.py | 2 |
7 files changed, 22 insertions, 22 deletions
diff --git a/lib/portage/elog/mod_mail_summary.py b/lib/portage/elog/mod_mail_summary.py index 0bd67f22b..a488e8096 100644 --- a/lib/portage/elog/mod_mail_summary.py +++ b/lib/portage/elog/mod_mail_summary.py @@ -68,7 +68,7 @@ def _finalize(mysettings, items): mybody = _("elog messages for the following packages generated by " "process %(pid)d on host %(host)s:\n") % {"pid": os.getpid(), "host": socket.getfqdn()} for key in items: - mybody += "- %s\n" % key + mybody += "- %s\n" % key mymessage = portage.mail.create_message(myfrom, myrecipient, mysubject, mybody, attachments=list(items.values())) diff --git a/lib/portage/emaint/modules/merges/merges.py b/lib/portage/emaint/modules/merges/merges.py index efc4ae699..a2b70edb8 100644 --- a/lib/portage/emaint/modules/merges/merges.py +++ b/lib/portage/emaint/modules/merges/merges.py @@ -224,9 +224,9 @@ class MergesHandler: if output: results.append(output) if proc.returncode != os.EX_OK: - emerge_status = "Failed to emerge '%s'" % (' '.join(pkg_atoms)) + emerge_status = "Failed to emerge '%s'" % (' '.join(pkg_atoms)) else: - emerge_status = "Successfully emerged '%s'" % (' '.join(pkg_atoms)) + emerge_status = "Successfully emerged '%s'" % (' '.join(pkg_atoms)) results.append(emerge_status) return results diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py index 527bdf9c3..d3e7af7fb 100644 --- a/lib/portage/package/ebuild/config.py +++ b/lib/portage/package/ebuild/config.py @@ -2694,7 +2694,7 @@ class config: def __contains__(self, mykey): """Called to implement membership test operators (in and not in).""" try: - self._getitem(mykey) + self._getitem(mykey) except KeyError: return False else: diff --git a/lib/portage/tests/sets/shell/testShell.py b/lib/portage/tests/sets/shell/testShell.py index a1eddacc9..58dc750bf 100644 --- a/lib/portage/tests/sets/shell/testShell.py +++ b/lib/portage/tests/sets/shell/testShell.py @@ -21,7 +21,7 @@ class CommandOutputSetTestCase(TestCase): command = find_binary("bash") command += " -c '" for a in params: - command += " echo -e \"%s\" ; " % a + command += " echo -e \"%s\" ; " % a command += "'" s = CommandOutputSet(command) atoms = s.getAtoms() diff --git a/lib/portage/util/futures/_asyncio/__init__.py b/lib/portage/util/futures/_asyncio/__init__.py index 383f14d07..c944bfe5e 100644 --- a/lib/portage/util/futures/_asyncio/__init__.py +++ b/lib/portage/util/futures/_asyncio/__init__.py @@ -99,14 +99,14 @@ def get_event_loop(): def get_child_watcher(): - """Equivalent to calling get_event_loop_policy().get_child_watcher().""" - return get_event_loop_policy().get_child_watcher() + """Equivalent to calling get_event_loop_policy().get_child_watcher().""" + return get_event_loop_policy().get_child_watcher() def set_child_watcher(watcher): - """Equivalent to calling - get_event_loop_policy().set_child_watcher(watcher).""" - return get_event_loop_policy().set_child_watcher(watcher) + """Equivalent to calling + get_event_loop_policy().set_child_watcher(watcher).""" + return get_event_loop_policy().set_child_watcher(watcher) def create_subprocess_exec(*args, **kwargs): diff --git a/lib/portage/util/futures/events.py b/lib/portage/util/futures/events.py index cc285189d..85032fcdf 100644 --- a/lib/portage/util/futures/events.py +++ b/lib/portage/util/futures/events.py @@ -16,22 +16,22 @@ from asyncio.events import ( class AbstractEventLoopPolicy(_AbstractEventLoopPolicy): - """Abstract policy for accessing the event loop.""" + """Abstract policy for accessing the event loop.""" - def get_event_loop(self): - raise NotImplementedError + def get_event_loop(self): + raise NotImplementedError - def set_event_loop(self, loop): - raise NotImplementedError + def set_event_loop(self, loop): + raise NotImplementedError - def new_event_loop(self): - raise NotImplementedError + def new_event_loop(self): + raise NotImplementedError - def get_child_watcher(self): - raise NotImplementedError + def get_child_watcher(self): + raise NotImplementedError - def set_child_watcher(self, watcher): - raise NotImplementedError + def set_child_watcher(self, watcher): + raise NotImplementedError class AbstractEventLoop(_AbstractEventLoop): diff --git a/lib/portage/util/whirlpool.py b/lib/portage/util/whirlpool.py index 3c027fd2a..1071d5155 100644 --- a/lib/portage/util/whirlpool.py +++ b/lib/portage/util/whirlpool.py @@ -25,7 +25,7 @@ ## ## This Python implementation is therefore also placed in the public domain. - +# pylint: disable=mixed-indentation #block_size = 64 digest_size = 64 |