platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 01:57:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Switch Python or Platform dependent code to "compat" module

Browse Source
This commit is contained in:
Ivan Kravets
2019-05-10 17:50:08 +03:00
parent 834206ff20
commit 5e1a931145
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platformio/builder/main.py
View File

@ -29,6 +29,7 @@ from SCons.Script import DefaultEnvironment # pylint: disable=import-error
from SCons.Script import Variables # pylint: disable=import-error from SCons.Script import Variables # pylint: disable=import-error
from platformio import util from platformio import util
from platformio.compat import PY2, path_to_unicode
from platformio.project.helpers import ( from platformio.project.helpers import (
get_project_dir, get_project_optional_dir, get_projectbuild_dir, get_project_dir, get_project_optional_dir, get_projectbuild_dir,
get_projectdata_dir, get_projectinclude_dir, get_projectlib_dir, get_projectdata_dir, get_projectinclude_dir, get_projectlib_dir,
@ -174,7 +175,7 @@ env.LoadPioPlatform(commonvars)
env.SConscriptChdir(0) env.SConscriptChdir(0)
env.SConsignFile( env.SConsignFile(
join("$PROJECTBUILD_DIR", join("$PROJECTBUILD_DIR",
".sconsign.dblite" if util.PY2 else ".sconsign3.dblite")) ".sconsign.dblite" if PY2 else ".sconsign3.dblite"))
for item in env.GetExtraScripts("pre"): for item in env.GetExtraScripts("pre"):
env.SConscript(item, exports="env") env.SConscript(item, exports="env")
@ -216,7 +217,7 @@ if "envdump" in COMMAND_LINE_TARGETS:
if "idedata" in COMMAND_LINE_TARGETS: if "idedata" in COMMAND_LINE_TARGETS:
try: try:
print("\n%s\n" % util.path_to_unicode( print("\n%s\n" % path_to_unicode(
json.dumps(env.DumpIDEData(), ensure_ascii=False))) json.dumps(env.DumpIDEData(), ensure_ascii=False)))
env.Exit(0) env.Exit(0)
except UnicodeDecodeError: except UnicodeDecodeError:

5
platformio/managers/package.py
View File

@ -26,6 +26,7 @@ import requests
import semantic_version import semantic_version
from platformio import __version__, app, exception, telemetry, util from platformio import __version__, app, exception, telemetry, util
from platformio.compat import path_to_unicode
from platformio.downloader import FileDownloader from platformio.downloader import FileDownloader
from platformio.lockfile import LockFile from platformio.lockfile import LockFile
from platformio.unpacker import FileUnpacker from platformio.unpacker import FileUnpacker
@ -392,7 +393,7 @@ class PkgInstallerMixin(object):
if "version" not in manifest: if "version" not in manifest:
manifest['version'] = "0.0.0" manifest['version'] = "0.0.0"
manifest['__pkg_dir'] = util.path_to_unicode(pkg_dir) manifest['__pkg_dir'] = path_to_unicode(pkg_dir)
self.cache_set(cache_key, manifest) self.cache_set(cache_key, manifest)
return manifest return manifest
@ -449,7 +450,7 @@ class PkgInstallerMixin(object):
def get_package_by_dir(self, pkg_dir): def get_package_by_dir(self, pkg_dir):
for manifest in self.get_installed(): for manifest in self.get_installed():
if manifest['__pkg_dir'] == util.path_to_unicode(abspath(pkg_dir)): if manifest['__pkg_dir'] == path_to_unicode(abspath(pkg_dir)):
return manifest return manifest
return None return None