Skip to content

Commit e15e578

Browse files
committed
Address review feedback
1 parent 4666a6a commit e15e578

File tree

4 files changed

+15
-17
lines changed

4 files changed

+15
-17
lines changed

lldb/packages/Python/lldbsuite/test/decorators.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# System modules
22
from functools import wraps
3-
from packaging.version import parse
3+
from packaging import version
44
import ctypes
55
import locale
66
import os
@@ -66,7 +66,7 @@ def fn_neq(x, y):
6666
"<=": fn_leq,
6767
}
6868

69-
return op_lookup[comparison](parse(actual), parse(expected))
69+
return op_lookup[comparison](version.parse(actual), version.parse(expected))
7070

7171

7272
def _match_decorator_property(expected, actual):

lldb/packages/Python/lldbsuite/test/lldbplatformutil.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import subprocess
99
import sys
1010
import os
11-
from packaging.version import parse
11+
from packaging import version
1212

1313
# LLDB modules
1414
import lldb
@@ -308,17 +308,17 @@ def expectedCompilerVersion(compiler_version):
308308
# Assume the compiler version is at or near the top of trunk.
309309
return operator in [">", ">=", "!", "!=", "not"]
310310

311-
version = parse(version_str)
312-
test_compiler_version = parse(test_compiler_version_str)
311+
actual_version = version.parse(version_str)
312+
test_compiler_version = version.parse(test_compiler_version_str)
313313

314314
if operator == ">":
315-
return test_compiler_version > version
315+
return test_compiler_version > actual_version
316316
if operator == ">=" or operator == "=>":
317-
return test_compiler_version >= version
317+
return test_compiler_version >= actual_version
318318
if operator == "<":
319-
return test_compiler_version < version
319+
return test_compiler_version < actual_version
320320
if operator == "<=" or operator == "=<":
321-
return test_compiler_version <= version
321+
return test_compiler_version <= actual_version
322322
if operator == "!=" or operator == "!" or operator == "not":
323323
return version_str not in test_compiler_version_str
324324
return version_str in test_compiler_version_str

lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@ def check_simulator_ostype(self, sdk, platform_name, arch=platform.machine()):
6161

6262
# Older versions of watchOS (<7.0) only support i386
6363
if platform_name == "watchos":
64-
from packaging.version import parse
64+
from packaging import version
6565

66-
if parse(vers) < parse("7.0"):
66+
if version.parse(vers) < version.parse("7.0"):
6767
arch = "i386"
6868

6969
triple = "-".join([arch, "apple", platform_name + vers, "simulator"])

lldb/test/Shell/helper/build.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,9 +441,9 @@ def _get_vctools_version(self):
441441
if not subdirs:
442442
return None
443443

444-
from distutils.version import StrictVersion
444+
from packaging import version
445445

446-
subdirs.sort(key=lambda x: StrictVersion(x))
446+
subdirs.sort(key=lambda x: version.parse(x))
447447

448448
if self.verbose:
449449
full_path = os.path.join(vcinstalldir, subdirs[-1])
@@ -517,11 +517,9 @@ def _find_windows_sdk_in_registry_view(self, view):
517517
if not sdk_versions:
518518
return (None, None)
519519

520-
# Windows SDK version numbers consist of 4 dotted components, so we
521-
# have to use LooseVersion, as StrictVersion supports 3 or fewer.
522-
from packaging.version import parse
520+
from packaging import version
523521

524-
sdk_versions.sort(key=lambda x: parse(x), reverse=True)
522+
sdk_versions.sort(key=lambda x: version.parse(x), reverse=True)
525523
option_value_name = "OptionId.DesktopCPP" + self.msvc_arch_str
526524
for v in sdk_versions:
527525
try:

0 commit comments

Comments
 (0)