feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Cleanup code

Browse Source
This commit is contained in:
Ivan Kravets
2021-12-15 11:59:19 +02:00
parent 5098f5f420
commit dec38273b6
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio/commands/remote/command.py
View File

@ -37,7 +37,7 @@ from platformio.project.exception import NotPlatformIOProjectError
@click.pass_context @click.pass_context
def cli(ctx, agent): def cli(ctx, agent):
ctx.obj = agent ctx.obj = agent
inject_contrib_pysite(verify_openssl=True) inject_contrib_pysite()
@cli.group("agent", short_help="Start a new agent or list active") @cli.group("agent", short_help="Start a new agent or list active")

7
platformio/package/manager/core.py
View File

@ -102,7 +102,7 @@ def remove_unnecessary_core_packages(dry_run=False):
return candidates return candidates
def inject_contrib_pysite(verify_openssl=False): def inject_contrib_pysite():
# pylint: disable=import-outside-toplevel # pylint: disable=import-outside-toplevel
from site import addsitedir from site import addsitedir
@ -120,12 +120,10 @@ def inject_contrib_pysite(verify_openssl=False):
addsitedir(contrib_pysite_dir) addsitedir(contrib_pysite_dir)
sys.path.insert(0, contrib_pysite_dir) sys.path.insert(0, contrib_pysite_dir)
if not verify_openssl:
return True
try: try:
# pylint: disable=import-error,unused-import,unused-variable # pylint: disable=import-error,unused-import,unused-variable
from OpenSSL import SSL from OpenSSL import SSL
except: # pylint: disable=bare-except except: # pylint: disable=bare-except
build_contrib_pysite_package(contrib_pysite_dir) build_contrib_pysite_package(contrib_pysite_dir)
@ -222,7 +220,6 @@ def get_contrib_pysite_deps():
"cryptography >= 3.3, < 35.0.0", "cryptography >= 3.3, < 35.0.0",
"pyopenssl >= 16.0.0, <= 21.0.0", "pyopenssl >= 16.0.0, <= 21.0.0",
"service_identity >= 18.1.0, <= 21.1.0", "service_identity >= 18.1.0, <= 21.1.0",
"asdasdasdasdasdas",
] ]
sys_type = util.get_systype() sys_type = util.get_systype()