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

YAPF formatting

Browse Source
This commit is contained in:
Ivan Kravets
2017-03-02 17:09:22 +02:00
parent cfd1f03023
commit fe1846c2e1
11 changed files with 38 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platformio/builder/tools/piolib.py
View File

@ -46,9 +46,8 @@ class LibBuilderFactory(object):
elif used_frameworks: elif used_frameworks:
clsname = "%sLibBuilder" % used_frameworks[0].title() clsname = "%sLibBuilder" % used_frameworks[0].title()
obj = getattr(sys.modules[__name__], clsname)(env, obj = getattr(sys.modules[__name__], clsname)(
path, env, path, verbose=verbose)
verbose=verbose)
assert isinstance(obj, LibBuilderBase) assert isinstance(obj, LibBuilderBase)
return obj return obj
@ -614,9 +613,8 @@ def GetLibBuilders(env): # pylint: disable=too-many-branches
if item == "__cores__" or not isdir(join(libs_dir, item)): if item == "__cores__" or not isdir(join(libs_dir, item)):
continue continue
try: try:
lb = LibBuilderFactory.new(env, lb = LibBuilderFactory.new(
join(libs_dir, item), env, join(libs_dir, item), verbose=verbose)
verbose=verbose)
except ValueError: except ValueError:
if verbose: if verbose:
sys.stderr.write("Skip library with broken manifest: %s\n" sys.stderr.write("Skip library with broken manifest: %s\n"

3
platformio/builder/tools/platformio.py
View File

@ -266,8 +266,7 @@ def BuildLibrary(env, variant_dir, src_dir, src_filter=None):
lib = env.Clone() lib = env.Clone()
return lib.StaticLibrary( return lib.StaticLibrary(
lib.subst(variant_dir), lib.subst(variant_dir),
lib.CollectBuildFiles( lib.CollectBuildFiles(variant_dir, src_dir, src_filter=src_filter))
variant_dir, src_dir, src_filter=src_filter))
def BuildSources(env, variant_dir, src_dir, src_filter=None): def BuildSources(env, variant_dir, src_dir, src_filter=None):

6
platformio/commands/init.py
View File

@ -81,15 +81,13 @@ def cli(
click.echo("") click.echo("")
click.echo("The next files/directories have been created in %s" % click.echo("The next files/directories have been created in %s" %
click.style( click.style(project_dir, fg="cyan"))
project_dir, fg="cyan"))
click.echo("%s - Project Configuration File" % click.style( click.echo("%s - Project Configuration File" % click.style(
"platformio.ini", fg="cyan")) "platformio.ini", fg="cyan"))
click.echo("%s - Put your source files here" % click.style( click.echo("%s - Put your source files here" % click.style(
"src", fg="cyan")) "src", fg="cyan"))
click.echo("%s - Put here project specific (private) libraries" % click.echo("%s - Put here project specific (private) libraries" %
click.style( click.style("lib", fg="cyan"))
"lib", fg="cyan"))
init_base_project(project_dir) init_base_project(project_dir)

15
platformio/commands/lib.py
View File

@ -199,8 +199,7 @@ def lib_search(query, json_output, page, noninteractive, **filters):
result = get_api_result( result = get_api_result(
"/v2/lib/search", "/v2/lib/search",
dict( dict(query=" ".join(query), page=page),
query=" ".join(query), page=page),
cache_valid="3d") cache_valid="3d")
if json_output: if json_output:
@ -411,11 +410,9 @@ def lib_stats(json_output):
def _print_header(with_date=False): def _print_header(with_date=False):
click.echo((printitemdate_tpl if with_date else printitem_tpl).format( click.echo((printitemdate_tpl if with_date else printitem_tpl).format(
name=click.style( name=click.style("Name", fg="cyan"),
"Name", fg="cyan"),
date="Date", date="Date",
url=click.style( url=click.style("Url", fg="blue")))
"Url", fg="blue")))
terminal_width, _ = click.get_terminal_size() terminal_width, _ = click.get_terminal_size()
click.echo("-" * terminal_width) click.echo("-" * terminal_width)
@ -424,8 +421,7 @@ def lib_stats(json_output):
click.echo(( click.echo((
printitemdate_tpl if "date" in item else printitem_tpl printitemdate_tpl if "date" in item else printitem_tpl
).format( ).format(
name=click.style( name=click.style(item['name'], fg="cyan"),
item['name'], fg="cyan"),
date=str( date=str(
arrow.get(item['date']).humanize() if "date" in item else ""), arrow.get(item['date']).humanize() if "date" in item else ""),
url=click.style( url=click.style(
@ -436,8 +432,7 @@ def lib_stats(json_output):
def _print_tag_item(name): def _print_tag_item(name):
click.echo( click.echo(
printitem_tpl.format( printitem_tpl.format(
name=click.style( name=click.style(name, fg="cyan"),
name, fg="cyan"),
url=click.style( url=click.style(
"http://platformio.org/lib/search?query=" + quote( "http://platformio.org/lib/search?query=" + quote(
"keyword:%s" % name), "keyword:%s" % name),

4
platformio/commands/run.py
View File

@ -342,9 +342,7 @@ def print_summary(results, start_time):
format_str = ( format_str = (
"Environment {0:<" + str(envname_max_len + 9) + "}\t[{1}]") "Environment {0:<" + str(envname_max_len + 9) + "}\t[{1}]")
click.echo( click.echo(
format_str.format( format_str.format(click.style(envname, fg="cyan"), status_str),
click.style(
envname, fg="cyan"), status_str),
err=status is False) err=status is False)
print_header( print_header(

11
platformio/commands/settings.py
View File

@ -31,11 +31,9 @@ def settings_get(name):
click.echo( click.echo(
list_tpl.format( list_tpl.format(
name=click.style( name=click.style("Name", fg="cyan"),
"Name", fg="cyan"), value=(click.style("Value", fg="green") + click.style(
value=(click.style( " [Default]", fg="yellow")),
"Value", fg="green") + click.style(
" [Default]", fg="yellow")),
description="Description")) description="Description"))
click.echo("-" * terminal_width) click.echo("-" * terminal_width)
@ -59,8 +57,7 @@ def settings_get(name):
click.echo( click.echo(
list_tpl.format( list_tpl.format(
name=click.style( name=click.style(_name, fg="cyan"),
_name, fg="cyan"),
value=_value_str, value=_value_str,
description=_data['description'])) description=_data['description']))

12
platformio/commands/upgrade.py
View File

@ -101,9 +101,10 @@ def get_latest_version():
def get_develop_latest_version(): def get_develop_latest_version():
version = None version = None
r = requests.get("https://raw.githubusercontent.com/platformio/platformio" r = requests.get(
"/develop/platformio/__init__.py", "https://raw.githubusercontent.com/platformio/platformio"
headers=util.get_request_defheaders()) "/develop/platformio/__init__.py",
headers=util.get_request_defheaders())
r.raise_for_status() r.raise_for_status()
for line in r.text.split("\n"): for line in r.text.split("\n"):
line = line.strip() line = line.strip()
@ -121,7 +122,8 @@ def get_develop_latest_version():
def get_pypi_latest_version(): def get_pypi_latest_version():
r = requests.get("https://pypi.python.org/pypi/platformio/json", r = requests.get(
headers=util.get_request_defheaders()) "https://pypi.python.org/pypi/platformio/json",
headers=util.get_request_defheaders())
r.raise_for_status() r.raise_for_status()
return r.json()['info']['version'] return r.json()['info']['version']

5
platformio/downloader.py
View File

@ -31,9 +31,8 @@ class FileDownloader(object):
def __init__(self, url, dest_dir=None): def __init__(self, url, dest_dir=None):
# make connection # make connection
self._request = requests.get(url, self._request = requests.get(
stream=True, url, stream=True, headers=util.get_request_defheaders())
headers=util.get_request_defheaders())
if self._request.status_code != 200: if self._request.status_code != 200:
raise FDUnrecognizedStatusCode(self._request.status_code, url) raise FDUnrecognizedStatusCode(self._request.status_code, url)

11
platformio/maintenance.py
View File

@ -191,14 +191,13 @@ def after_upgrade(ctx):
"on the latest project news > %s" % (click.style( "on the latest project news > %s" % (click.style(
"follow", fg="cyan"), click.style( "follow", fg="cyan"), click.style(
"https://twitter.com/PlatformIO_Org", fg="cyan"))) "https://twitter.com/PlatformIO_Org", fg="cyan")))
click.echo("- %s it on GitHub > %s" % (click.style( click.echo("- %s it on GitHub > %s" %
"star", fg="cyan"), click.style( (click.style("star", fg="cyan"), click.style(
"https://github.com/platformio/platformio", fg="cyan"))) "https://github.com/platformio/platformio", fg="cyan")))
if not getenv("PLATFORMIO_IDE"): if not getenv("PLATFORMIO_IDE"):
click.echo("- %s PlatformIO IDE for IoT development > %s" % click.echo("- %s PlatformIO IDE for IoT development > %s" %
(click.style( (click.style("try", fg="cyan"), click.style(
"try", fg="cyan"), click.style( "http://platformio.org/platformio-ide", fg="cyan")))
"http://platformio.org/platformio-ide", fg="cyan")))
if not util.is_ci(): if not util.is_ci():
click.echo("- %s us with PlatformIO Plus > %s" % (click.style( click.echo("- %s us with PlatformIO Plus > %s" % (click.style(
"support", fg="cyan"), click.style( "support", fg="cyan"), click.style(

3
platformio/managers/lib.py
View File

@ -217,8 +217,7 @@ class LibraryManager(BasePkgManager):
util.get_api_result( util.get_api_result(
"/lib/info/%d" % self.get_pkg_id_by_name( "/lib/info/%d" % self.get_pkg_id_by_name(
name, requirements, silent=silent), name, requirements, silent=silent),
cache_valid="1d")['versions'], cache_valid="1d")['versions'], requirements)
requirements)
return item['name'] if item else None return item['name'] if item else None
def get_pkg_id_by_name(self, def get_pkg_id_by_name(self,

11
platformio/util.py
View File

@ -458,11 +458,12 @@ def _get_api_result(
auth=auth, auth=auth,
verify=disable_ssl_check) verify=disable_ssl_check)
else: else:
r = _api_request_session().get(url, r = _api_request_session().get(
params=params, url,
headers=headers, params=params,
auth=auth, headers=headers,
verify=disable_ssl_check) auth=auth,
verify=disable_ssl_check)
result = r.json() result = r.json()
r.raise_for_status() r.raise_for_status()
except requests.exceptions.HTTPError as e: except requests.exceptions.HTTPError as e: