diff options
Diffstat (limited to 'lib/spack/spack/version.py')
| -rw-r--r-- | lib/spack/spack/version.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/spack/spack/version.py b/lib/spack/spack/version.py index f4f08d8c77..20f0c13d1c 100644 --- a/lib/spack/spack/version.py +++ b/lib/spack/spack/version.py @@ -30,8 +30,6 @@ import re from bisect import bisect_left from functools import wraps -from six import string_types - import llnl.util.tty as tty from llnl.util.filesystem import mkdirp, working_dir @@ -721,9 +719,9 @@ class GitVersion(VersionBase): class VersionRange(object): def __init__(self, start, end): - if isinstance(start, string_types): + if isinstance(start, str): start = Version(start) - if isinstance(end, string_types): + if isinstance(end, str): end = Version(end) self.start = start @@ -939,7 +937,7 @@ class VersionList(object): def __init__(self, vlist=None): self.versions = [] if vlist is not None: - if isinstance(vlist, string_types): + if isinstance(vlist, str): vlist = _string_to_version(vlist) if type(vlist) == VersionList: self.versions = vlist.versions @@ -1193,7 +1191,7 @@ def ver(obj): """ if isinstance(obj, (list, tuple)): return VersionList(obj) - elif isinstance(obj, string_types): + elif isinstance(obj, str): return _string_to_version(obj) elif isinstance(obj, (int, float)): return _string_to_version(str(obj)) |