Skip to content

Commit cb91912

Browse files
committed
fixing bugs introduced in last commit
1 parent 8034bd0 commit cb91912

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

version_query/version.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def _parse_pre_release_str(cls, pre_release: str) -> tuple:
8686

8787
_re_local_separator = rf'({_re_sep})'
8888
_re_local_part = rf'({_re_alphanumeric})'
89-
_re_local_parts = r'\+{_re_local_part}(?:{_re_local_separator}{_re_local_part})*'
89+
_re_local_parts = rf'\+{_re_local_part}(?:{_re_local_separator}{_re_local_part})*'
9090
_pattern_local = re.compile(_re_local_parts)
9191

9292
@classmethod
@@ -135,25 +135,25 @@ def from_py_version(cls, py_version: packaging.version.Version):
135135
if not isinstance(py_version, packaging.version.Version):
136136
_LOG.warning('attempting to parse %s as packaging.version.Version...', type(py_version))
137137
ver = py_version._version
138-
major, minor, patch = [py_version.release[i] if len(py_version.release) > i
138+
major, minor, patch = [ver.release[i] if len(ver.release) > i
139139
else None for i in range(3)]
140140
pre_release = None
141141
local = None
142-
if len(py_version.release) == 4:
143-
pre_ver = (None, py_version.release[3])
144-
elif len(py_version.release) > 4:
142+
if len(ver.release) == 4:
143+
pre_ver = (None, ver.release[3])
144+
elif len(ver.release) > 4:
145145
raise NotImplementedError(py_version)
146146
else:
147147
pre_ver = None
148-
pre_ver_present = sum(1 for _ in (ver.post, ver.dev, py_version.pre) if _)
148+
pre_ver_present = sum(1 for _ in (ver.post, ver.dev, ver.pre) if _)
149149
if pre_ver and pre_ver_present:
150150
raise NotImplementedError(py_version)
151151
if pre_ver_present > 1:
152152
raise NotImplementedError(py_version)
153153
if ver.dev:
154154
pre_ver = ver.dev
155-
elif py_version.pre:
156-
pre_ver = py_version.pre
155+
elif ver.pre:
156+
pre_ver = ver.pre
157157
if pre_ver:
158158
pre_release = [('.',) + tuple(pre_ver[i] if pre_ver and len(pre_ver) > i else None
159159
for i in range(2))]

0 commit comments

Comments
 (0)