Refactor PyLint "inconsistent-return-statements"

This commit is contained in:
Ivan Kravets committed 2017-12-15 22:16:37 +02:00
1 parent bff590e207
commit 42fb589369
14 files changed
+48 -24

No files matched your search

+8 -1
View File
@@ -42,7 +42,12 @@ class CorePackageManager(PackageManager):
("" if sys.version_info < (2, 7, 9) else "s")
])
def install(self, name, requirements=None, *args, **kwargs):
def install( # pylint: disable=keyword-arg-before-vararg
self,
name,
requirements=None,
*args,
**kwargs):
PackageManager.install(self, name, requirements, *args, **kwargs)
self.cleanup_packages()
return self.get_package_dir(name, requirements)
@@ -126,3 +131,5 @@ def pioplus_call(args, **kwargs):
if code != 0:
raise exception.ReturnErrorCode(1)
return True
+2 -2
View File
@@ -256,10 +256,10 @@ class LibraryManager(BasePkgManager):
except exception.InternetIsOffline as e:
if not silent:
click.secho(str(e), fg="yellow")
return
return None
if not pkg_dir:
return
return None
manifest = self.load_manifest(pkg_dir)
if "dependencies" not in manifest:
+6 -7
View File
@@ -384,7 +384,7 @@ class PkgInstallerMixin(object):
finally:
if isdir(tmp_dir):
util.rmtree_(tmp_dir)
return
return None
def _update_src_manifest(self, data, src_dir):
if not isdir(src_dir):
@@ -603,18 +603,17 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin):
requirements=None,
silent=False,
trigger_event=True):
name, requirements, url = self.parse_pkg_uri(name, requirements)
package_dir = self.get_package_dir(name, requirements, url)
# avoid circle dependencies
if not self.INSTALL_HISTORY:
self.INSTALL_HISTORY = []
history_key = "%s-%s" % (name, requirements) if requirements else name
if history_key in self.INSTALL_HISTORY:
return
return package_dir
self.INSTALL_HISTORY.append(history_key)
name, requirements, url = self.parse_pkg_uri(name, requirements)
package_dir = self.get_package_dir(name, requirements, url)
if not package_dir or not silent:
msg = "Installing " + click.style(name, fg="cyan")
if requirements:
@@ -714,7 +713,7 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin):
nl=False)
if not util.internet_on():
click.echo("[%s]" % (click.style("Off-line", fg="yellow")))
return
return None
latest = self.outdated(pkg_dir, requirements)
if latest:
@@ -725,7 +724,7 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin):
click.echo("[%s]" % (click.style("Fixed", fg="yellow")))
if only_check or not latest:
return
return True
if "__src_url" in manifest:
vcs = VCSClientFactory.newClient(pkg_dir, manifest['__src_url'])
+1 -1
View File
@@ -672,7 +672,7 @@ class PlatformBoardConfig(object):
def get_debug_data(self):
if not self._manifest.get("debug", {}).get("tools"):
return
return None
tools = {}
for name, options in self._manifest['debug']['tools'].items():
tools[name] = {}