commit: 9ed5ca27f3793a405a4e111af9b6110baf8268e8
Author: Alec Warner <antarus <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 06:12:39 2020 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 06:54:40 2020 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9ed5ca27
Fix C0305, trailing newlines.
pylint --disable=all --enable=C0305 | awk -F: '{print $1}' | xargs sed
-i -e '$d'
Removes the trailing newlines.
Signed-off-by: Alec Warner <antarus <AT> gentoo.org>
Change-Id: I18db6ec682192ab44e07bad00c14f316caf43c0e
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
lib/_emerge/BinpkgFetcher.py | 1 -
lib/_emerge/BinpkgPrefetcher.py | 1 -
lib/_emerge/BlockerCache.py | 1 -
lib/_emerge/DepPriority.py | 1 -
lib/_emerge/Dependency.py | 1 -
lib/_emerge/EbuildBuildDir.py | 1 -
lib/_emerge/EbuildExecuter.py | 1 -
lib/_emerge/PackageVirtualDbapi.py | 1 -
lib/_emerge/PipeReader.py | 1 -
lib/_emerge/ProgressHandler.py | 1 -
lib/_emerge/SetArg.py | 1 -
lib/_emerge/UnmergeDepPriority.py | 1 -
lib/_emerge/_find_deep_system_runtime_deps.py | 1 -
lib/_emerge/create_depgraph_params.py | 1 -
lib/_emerge/create_world_atom.py | 1 -
lib/_emerge/search.py | 1 -
lib/_emerge/show_invalid_depstring_notice.py | 1 -
lib/_emerge/unmerge.py | 1 -
lib/portage/cache/__init__.py | 1 -
lib/portage/cache/fs_template.py | 1 -
lib/portage/elog/__init__.py | 1 -
lib/portage/emaint/modules/world/world.py | 1 -
lib/portage/env/__init__.py | 1 -
lib/portage/exception.py | 1 -
lib/portage/locks.py | 1 -
lib/portage/mail.py | 1 -
lib/portage/package/ebuild/_parallel_manifest/ManifestScheduler.py | 1 -
lib/portage/progress.py | 1 -
lib/portage/sync/controller.py | 1 -
lib/portage/sync/modules/webrsync/webrsync.py | 1 -
lib/portage/tests/env/__init__.py | 1 -
lib/portage/tests/env/config/__init__.py | 1 -
lib/portage/tests/resolver/test_binary_pkg_ebuild_visibility.py | 1 -
lib/portage/tests/sets/files/testConfigFileSet.py | 1 -
lib/portage/tests/sets/files/testStaticFileSet.py | 1 -
lib/portage/tests/util/__init__.py | 1 -
lib/portage/util/_eventloop/PollConstants.py | 1 -
lib/portage/util/_eventloop/PollSelectAdapter.py | 1 -
lib/portage/util/formatter.py | 1 -
lib/portage/util/futures/compat_coroutine.py | 1 -
lib/portage/util/futures/events.py | 1 -
lib/portage/xml/metadata.py | 1 -
42 files changed, 42 deletions(-)
diff --git a/lib/_emerge/BinpkgFetcher.py b/lib/_emerge/BinpkgFetcher.py
index 01c9bc1e6..218d4d2ab 100644
--- a/lib/_emerge/BinpkgFetcher.py
+++ b/lib/_emerge/BinpkgFetcher.py
@@ -232,4 +232,3 @@ class _BinpkgFetcherProcess(SpawnProcess):
self._lock_obj = None
self.locked = False
return result
-
diff --git a/lib/_emerge/BinpkgPrefetcher.py b/lib/_emerge/BinpkgPrefetcher.py
index 7ca897049..1393297b5 100644
--- a/lib/_emerge/BinpkgPrefetcher.py
+++ b/lib/_emerge/BinpkgPrefetcher.py
@@ -40,4 +40,3 @@ class BinpkgPrefetcher(CompositeTask):
self._current_task = None
self.returncode = os.EX_OK
self.wait()
-
diff --git a/lib/_emerge/BlockerCache.py b/lib/_emerge/BlockerCache.py
index 008cbd0a8..8154d9ade 100644
--- a/lib/_emerge/BlockerCache.py
+++ b/lib/_emerge/BlockerCache.py
@@ -176,4 +176,3 @@ class BlockerCache(portage.cache.mappings.MutableMapping):
@return: An object with counter and atoms attributes.
"""
return self.BlockerData(*self._cache_data["blockers"][cpv])
-
diff --git a/lib/_emerge/DepPriority.py b/lib/_emerge/DepPriority.py
index 34fdb481c..ec79bb3d5 100644
--- a/lib/_emerge/DepPriority.py
+++ b/lib/_emerge/DepPriority.py
@@ -53,4 +53,3 @@ class DepPriority(AbstractDepPriority):
if self.runtime_post:
return "runtime_post"
return "soft"
-
diff --git a/lib/_emerge/Dependency.py b/lib/_emerge/Dependency.py
index 2ec860f83..ab3c5bbff 100644
--- a/lib/_emerge/Dependency.py
+++ b/lib/_emerge/Dependency.py
@@ -18,4 +18,3 @@ class Dependency(SlotObject):
self.collapsed_parent = self.parent
if self.collapsed_priority is None:
self.collapsed_priority = self.priority
-
diff --git a/lib/_emerge/EbuildBuildDir.py b/lib/_emerge/EbuildBuildDir.py
index 477113db8..04667dbd7 100644
--- a/lib/_emerge/EbuildBuildDir.py
+++ b/lib/_emerge/EbuildBuildDir.py
@@ -158,4 +158,3 @@ class EbuildBuildDir(SlotObject):
class AlreadyLocked(portage.exception.PortageException):
pass
-
diff --git a/lib/_emerge/EbuildExecuter.py b/lib/_emerge/EbuildExecuter.py
index acc57c1d0..11e49804f 100644
--- a/lib/_emerge/EbuildExecuter.py
+++ b/lib/_emerge/EbuildExecuter.py
@@ -79,4 +79,3 @@ class EbuildExecuter(CompositeTask):
settings=self.settings))
self._start_task(ebuild_phases, self._default_final_exit)
-
diff --git a/lib/_emerge/PackageVirtualDbapi.py
b/lib/_emerge/PackageVirtualDbapi.py
index 2070dd9be..4bba8c959 100644
--- a/lib/_emerge/PackageVirtualDbapi.py
+++ b/lib/_emerge/PackageVirtualDbapi.py
@@ -142,4 +142,3 @@ class PackageVirtualDbapi(dbapi):
def aux_update(self, cpv, values):
self._cpv_map[cpv]._metadata.update(values)
self._clear_cache()
-
diff --git a/lib/_emerge/PipeReader.py b/lib/_emerge/PipeReader.py
index 4139fbae2..852378113 100644
--- a/lib/_emerge/PipeReader.py
+++ b/lib/_emerge/PipeReader.py
@@ -92,4 +92,3 @@ class PipeReader(AbstractPollTask):
self.scheduler.remove_reader(f.fileno())
f.close()
self.input_files = None
-
diff --git a/lib/_emerge/ProgressHandler.py b/lib/_emerge/ProgressHandler.py
index 89dacf48f..d7787e040 100644
--- a/lib/_emerge/ProgressHandler.py
+++ b/lib/_emerge/ProgressHandler.py
@@ -19,4 +19,3 @@ class ProgressHandler:
def display(self):
raise NotImplementedError(self)
-
diff --git a/lib/_emerge/SetArg.py b/lib/_emerge/SetArg.py
index 5c8297547..2fee86c49 100644
--- a/lib/_emerge/SetArg.py
+++ b/lib/_emerge/SetArg.py
@@ -11,4 +11,3 @@ class SetArg(DependencyArg):
DependencyArg.__init__(self, **kwargs)
self.pset = pset
self.name = self.arg[len(SETPREFIX):]
-
diff --git a/lib/_emerge/UnmergeDepPriority.py
b/lib/_emerge/UnmergeDepPriority.py
index ec44a67a1..ed831ed45 100644
--- a/lib/_emerge/UnmergeDepPriority.py
+++ b/lib/_emerge/UnmergeDepPriority.py
@@ -43,4 +43,3 @@ class UnmergeDepPriority(AbstractDepPriority):
if myvalue > self.SOFT:
return "hard"
return "soft"
-
diff --git a/lib/_emerge/_find_deep_system_runtime_deps.py
b/lib/_emerge/_find_deep_system_runtime_deps.py
index ca09d83ac..d88296d5f 100644
--- a/lib/_emerge/_find_deep_system_runtime_deps.py
+++ b/lib/_emerge/_find_deep_system_runtime_deps.py
@@ -35,4 +35,3 @@ def _find_deep_system_runtime_deps(graph):
node_stack.append(child)
return deep_system_deps
-
diff --git a/lib/_emerge/create_depgraph_params.py
b/lib/_emerge/create_depgraph_params.py
index 81edcb9c0..0d0e07b9c 100644
--- a/lib/_emerge/create_depgraph_params.py
+++ b/lib/_emerge/create_depgraph_params.py
@@ -195,4 +195,3 @@ def create_depgraph_params(myopts, myaction):
noiselevel=-1, level=logging.DEBUG)
return myparams
-
diff --git a/lib/_emerge/create_world_atom.py b/lib/_emerge/create_world_atom.py
index 9d08b6af8..8b506c36e 100644
--- a/lib/_emerge/create_world_atom.py
+++ b/lib/_emerge/create_world_atom.py
@@ -121,4 +121,3 @@ def create_world_atom(pkg, args_set, root_config,
before_install=False):
providers[0].cp == arg_atom.cp:
return None
return new_world_atom
-
diff --git a/lib/_emerge/search.py b/lib/_emerge/search.py
index 6cb69d3c1..14d7e3562 100644
--- a/lib/_emerge/search.py
+++ b/lib/_emerge/search.py
@@ -526,4 +526,3 @@ class search:
else:
result = ""
return result
-
diff --git a/lib/_emerge/show_invalid_depstring_notice.py
b/lib/_emerge/show_invalid_depstring_notice.py
index e11ea65ed..a2f29eae6 100644
--- a/lib/_emerge/show_invalid_depstring_notice.py
+++ b/lib/_emerge/show_invalid_depstring_notice.py
@@ -32,4 +32,3 @@ def show_invalid_depstring_notice(parent_node, error_msg):
msg2 = "".join("%s\n" % line for line in textwrap.wrap("".join(msg),
72))
writemsg_level(msg1 + msg2, level=logging.ERROR, noiselevel=-1)
-
diff --git a/lib/_emerge/unmerge.py b/lib/_emerge/unmerge.py
index 8923e20ea..9c012e431 100644
--- a/lib/_emerge/unmerge.py
+++ b/lib/_emerge/unmerge.py
@@ -605,4 +605,3 @@ def unmerge(root_config, myopts, unmerge_action,
sets["selected"].unlock()
return os.EX_OK
-
diff --git a/lib/portage/cache/__init__.py b/lib/portage/cache/__init__.py
index e7fe599f0..e0b8b827f 100644
--- a/lib/portage/cache/__init__.py
+++ b/lib/portage/cache/__init__.py
@@ -1,4 +1,3 @@
# Copyright: 2005 Gentoo Foundation
# Author(s): Brian Harring ([email protected])
# License: GPL2
-
diff --git a/lib/portage/cache/fs_template.py b/lib/portage/cache/fs_template.py
index a4ca74609..da01c2d0a 100644
--- a/lib/portage/cache/fs_template.py
+++ b/lib/portage/cache/fs_template.py
@@ -86,4 +86,3 @@ def gen_label(base, label):
label = os.path.join(*(label.rstrip(os.path.sep).split(os.path.sep)))
tail = os.path.split(label)[1]
return "%s-%X" % (tail, abs(label.__hash__()))
-
diff --git a/lib/portage/elog/__init__.py b/lib/portage/elog/__init__.py
index e196a771d..ad6048481 100644
--- a/lib/portage/elog/__init__.py
+++ b/lib/portage/elog/__init__.py
@@ -185,4 +185,3 @@ def elog_process(cpv, mysettings, phasefilter=None):
noiselevel=-1)
except PortageException as e:
writemsg("%s\n" % str(e), noiselevel=-1)
-
diff --git a/lib/portage/emaint/modules/world/world.py
b/lib/portage/emaint/modules/world/world.py
index 5771cc6ae..33fbaf58f 100644
--- a/lib/portage/emaint/modules/world/world.py
+++ b/lib/portage/emaint/modules/world/world.py
@@ -90,4 +90,3 @@ class WorldHandler:
return (True, None)
finally:
world_set.unlock()
-
diff --git a/lib/portage/env/__init__.py b/lib/portage/env/__init__.py
index 17b66d17c..1c0d15fbd 100644
--- a/lib/portage/env/__init__.py
+++ b/lib/portage/env/__init__.py
@@ -1,3 +1,2 @@
# Copyright: 2007 Gentoo Foundation
# License: GPL2
-
diff --git a/lib/portage/exception.py b/lib/portage/exception.py
index 51e1fec3e..5ef18f68a 100644
--- a/lib/portage/exception.py
+++ b/lib/portage/exception.py
@@ -181,4 +181,3 @@ class InvalidSignature(SignatureException):
class UntrustedSignature(SignatureException):
"""Signature was not certified to the desired security level"""
-
diff --git a/lib/portage/locks.py b/lib/portage/locks.py
index 2096024cb..1e3186880 100644
--- a/lib/portage/locks.py
+++ b/lib/portage/locks.py
@@ -717,4 +717,3 @@ def hardlock_cleanup(path, remove_all_locks=False):
pass
return results
-
diff --git a/lib/portage/mail.py b/lib/portage/mail.py
index 730c9352e..df7aac52d 100644
--- a/lib/portage/mail.py
+++ b/lib/portage/mail.py
@@ -138,4 +138,3 @@ def send_mail(mysettings, message):
except socket.error as e:
raise portage.exception.PortageException(_("!!! A
network error occurred while trying to send logmail:\n%s\nSure you configured
PORTAGE_ELOG_MAILURI correctly?") % str(e))
return
-
diff --git a/lib/portage/package/ebuild/_parallel_manifest/ManifestScheduler.py
b/lib/portage/package/ebuild/_parallel_manifest/ManifestScheduler.py
index fabea9bc1..aca42c1e1 100644
--- a/lib/portage/package/ebuild/_parallel_manifest/ManifestScheduler.py
+++ b/lib/portage/package/ebuild/_parallel_manifest/ManifestScheduler.py
@@ -85,4 +85,3 @@ class ManifestScheduler(AsyncScheduler):
AsyncScheduler._task_exit(self, task)
-
diff --git a/lib/portage/progress.py b/lib/portage/progress.py
index 6592c3a54..0be790106 100644
--- a/lib/portage/progress.py
+++ b/lib/portage/progress.py
@@ -58,4 +58,3 @@ class ProgressBar(ProgressHandler):
def stop(self):
signal.signal(signal.SIGWINCH, signal.SIG_DFL)
-
diff --git a/lib/portage/sync/controller.py b/lib/portage/sync/controller.py
index 410cb9a92..32a6429a0 100644
--- a/lib/portage/sync/controller.py
+++ b/lib/portage/sync/controller.py
@@ -396,4 +396,3 @@ class SyncRepo(CompositeTask):
self.returncode = sync_task.returncode
self.sync_callback(self.sync_task)
self._async_wait()
-
diff --git a/lib/portage/sync/modules/webrsync/webrsync.py
b/lib/portage/sync/modules/webrsync/webrsync.py
index 70f65cfcd..20cc25a2c 100644
--- a/lib/portage/sync/modules/webrsync/webrsync.py
+++ b/lib/portage/sync/modules/webrsync/webrsync.py
@@ -134,4 +134,3 @@ class PyWebRsync(SyncBase):
def sync(self, **kwargs):
'''Sync the repository'''
pass
-
diff --git a/lib/portage/tests/env/__init__.py
b/lib/portage/tests/env/__init__.py
index cbeabe5c6..59a3a1e22 100644
--- a/lib/portage/tests/env/__init__.py
+++ b/lib/portage/tests/env/__init__.py
@@ -1,4 +1,3 @@
# tests/portage/env/__init__.py -- Portage Unit Test functionality
# Copyright 2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-
diff --git a/lib/portage/tests/env/config/__init__.py
b/lib/portage/tests/env/config/__init__.py
index ef5cc43b6..daa503ba3 100644
--- a/lib/portage/tests/env/config/__init__.py
+++ b/lib/portage/tests/env/config/__init__.py
@@ -1,4 +1,3 @@
# tests/portage/env/config/__init__.py -- Portage Unit Test functionality
# Copyright 2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-
diff --git a/lib/portage/tests/resolver/test_binary_pkg_ebuild_visibility.py
b/lib/portage/tests/resolver/test_binary_pkg_ebuild_visibility.py
index 0d01d0696..0cd650402 100644
--- a/lib/portage/tests/resolver/test_binary_pkg_ebuild_visibility.py
+++ b/lib/portage/tests/resolver/test_binary_pkg_ebuild_visibility.py
@@ -141,4 +141,3 @@ class BinaryPkgEbuildVisibilityTestCase(TestCase):
test_case.fail_msg)
finally:
playground.cleanup()
-
diff --git a/lib/portage/tests/sets/files/testConfigFileSet.py
b/lib/portage/tests/sets/files/testConfigFileSet.py
index 3ec26a077..395da062a 100644
--- a/lib/portage/tests/sets/files/testConfigFileSet.py
+++ b/lib/portage/tests/sets/files/testConfigFileSet.py
@@ -29,4 +29,3 @@ class ConfigFileSetTestCase(TestCase):
s = ConfigFileSet(self.testfile)
s.load()
self.assertEqual(set(test_cps), s.getAtoms())
-
diff --git a/lib/portage/tests/sets/files/testStaticFileSet.py
b/lib/portage/tests/sets/files/testStaticFileSet.py
index d515a6728..11fc9a9d8 100644
--- a/lib/portage/tests/sets/files/testStaticFileSet.py
+++ b/lib/portage/tests/sets/files/testStaticFileSet.py
@@ -24,4 +24,3 @@ class StaticFileSetTestCase(TestCase):
s = StaticFileSet(self.testfile)
s.load()
self.assertEqual(set(test_cps), s.getAtoms())
-
diff --git a/lib/portage/tests/util/__init__.py
b/lib/portage/tests/util/__init__.py
index 69ce1898d..858d731e4 100644
--- a/lib/portage/tests/util/__init__.py
+++ b/lib/portage/tests/util/__init__.py
@@ -1,4 +1,3 @@
# tests/portage.util/__init__.py -- Portage Unit Test functionality
# Copyright 2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-
diff --git a/lib/portage/util/_eventloop/PollConstants.py
b/lib/portage/util/_eventloop/PollConstants.py
index e070b80f6..c5700d108 100644
--- a/lib/portage/util/_eventloop/PollConstants.py
+++ b/lib/portage/util/_eventloop/PollConstants.py
@@ -15,4 +15,3 @@ class PollConstants:
locals()[k] = getattr(select, k, v)
v *= 2
del k, v
-
diff --git a/lib/portage/util/_eventloop/PollSelectAdapter.py
b/lib/portage/util/_eventloop/PollSelectAdapter.py
index 53a2173ca..08dc664a4 100644
--- a/lib/portage/util/_eventloop/PollSelectAdapter.py
+++ b/lib/portage/util/_eventloop/PollSelectAdapter.py
@@ -73,4 +73,3 @@ class PollSelectAdapter:
for fd in select_events[0]:
poll_events.append((fd, PollConstants.POLLIN))
return poll_events
-
diff --git a/lib/portage/util/formatter.py b/lib/portage/util/formatter.py
index d23b09a67..8180a662c 100644
--- a/lib/portage/util/formatter.py
+++ b/lib/portage/util/formatter.py
@@ -66,4 +66,3 @@ class DumbWriter(NullWriter):
def send_literal_data(self, data):
self.file.write(data)
-
diff --git a/lib/portage/util/futures/compat_coroutine.py
b/lib/portage/util/futures/compat_coroutine.py
index 7b816f4dc..79bd0da68 100644
--- a/lib/portage/util/futures/compat_coroutine.py
+++ b/lib/portage/util/futures/compat_coroutine.py
@@ -134,4 +134,3 @@ class _GeneratorTask:
else:
self._current_task = asyncio.ensure_future(future,
loop=self._loop)
self._current_task.add_done_callback(self._next)
-
diff --git a/lib/portage/util/futures/events.py
b/lib/portage/util/futures/events.py
index fb1585b32..c2da2737d 100644
--- a/lib/portage/util/futures/events.py
+++ b/lib/portage/util/futures/events.py
@@ -184,4 +184,3 @@ class AbstractEventLoop(_AbstractEventLoop):
def set_debug(self, enabled):
raise NotImplementedError
-
diff --git a/lib/portage/xml/metadata.py b/lib/portage/xml/metadata.py
index 75321e6b8..646edb5b9 100644
--- a/lib/portage/xml/metadata.py
+++ b/lib/portage/xml/metadata.py
@@ -487,4 +487,3 @@ def parse_metadata_use(xml_tree):
# (flag_restrict can be None)
uselist[flag.get("name")][flag_restrict] = "
".join("".join(inner_text).split())
return uselist
-
