From f63041a40263959ea7333f7340943c3fac80f436 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Wed, 17 Apr 2019 23:20:45 +0300 Subject: [PATCH] Add `get_original_version` to public utils API --- platformio/commands/platform.py | 14 +------------- platformio/util.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/platformio/commands/platform.py b/platformio/commands/platform.py index 2d007d4a..bf7ecf75 100644 --- a/platformio/commands/platform.py +++ b/platformio/commands/platform.py @@ -54,18 +54,6 @@ def _get_registry_platforms(): return platforms -def _original_version(version): - if version.count(".") != 2: - return None - _, y = version.split(".")[:2] - if int(y) < 100: - return None - if len(y) % 2 != 0: - y = "0" + y - parts = [str(int(y[i * 2:i * 2 + 2])) for i in range(int(len(y) / 2))] - return ".".join(parts) - - def _get_platform_data(*args, **kwargs): try: return _get_installed_platform_data(*args, **kwargs) @@ -122,7 +110,7 @@ def _get_installed_platform_data(platform, continue item[key] = value if key == "version": - item["originalVersion"] = _original_version(value) + item["originalVersion"] = util.get_original_version(value) data['packages'].append(item) return data diff --git a/platformio/util.py b/platformio/util.py index cdba2501..dd280ba2 100644 --- a/platformio/util.py +++ b/platformio/util.py @@ -849,6 +849,18 @@ def ensure_udev_rules(): return True +def get_original_version(version): + if version.count(".") != 2: + return None + _, y = version.split(".")[:2] + if int(y) < 100: + return None + if len(y) % 2 != 0: + y = "0" + y + parts = [str(int(y[i * 2:i * 2 + 2])) for i in range(int(len(y) / 2))] + return ".".join(parts) + + def rmtree_(path): def _onerror(_, name, __):