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

Remove Python 2.6 code

Browse Source
This commit is contained in:
Ivan Kravets
2016-08-03 23:40:04 +03:00
parent 87d0ead203
commit 941c7ffd07
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio/__init__.py
View File

@ -14,7 +14,7 @@
import sys import sys
VERSION = (3, 0, "0.dev18") VERSION = (3, 0, "0.dev19")
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

2
platformio/commands/upgrade.py
View File

@ -43,8 +43,6 @@ def cli():
r = None r = None
try: try:
for cmd in cmds: for cmd in cmds:
if sys.version_info < (2, 7, 0):
cmd[0] += ".__main__"
cmd = [os.path.normpath(sys.executable), "-m"] + cmd cmd = [os.path.normpath(sys.executable), "-m"] + cmd
r = None r = None
r = util.exec_command(cmd) r = util.exec_command(cmd)

6
platformio/ide/projectgenerator.py
View File

@ -63,11 +63,7 @@ class ProjectGenerator(object):
envdata = self.get_project_env() envdata = self.get_project_env()
if "env_name" not in envdata: if "env_name" not in envdata:
return data return data
cmd = [ cmd = [normpath(sys.executable), "-m", "platformio", "-f"]
normpath(sys.executable), "-m",
"platformio" + (".__main__"
if sys.version_info < (2, 7, 0) else ""), "-f"
]
if app.get_session_var("caller_id"): if app.get_session_var("caller_id"):
cmd.extend(["-c", app.get_session_var("caller_id")]) cmd.extend(["-c", app.get_session_var("caller_id")])
cmd.extend(["run", "-t", "idedata", "-e", envdata['env_name']]) cmd.extend(["run", "-t", "idedata", "-e", envdata['env_name']])