Fix get_loader().load() from local couldn't get version correctly #59
Conversation
JayZ12138
force-pushed
the
fix-path
branch
2 times, most recently
from
04acf6d
to
e138331
Compare
JayZ12138
requested review from
alexandrevicenzi,
chandwanitulsi,
midnightercz,
negillett,
rajulkumar and
rohanpm
JayZ12138
force-pushed
the
fix-path
branch
2 times, most recently
from
715e1fc
to
54455d6
Compare
When version is None, it wrongly tried to get version from file name instead of file path.
instead of using os.getcwd, os.path.abspath is better.
ubiconfig/_impl/loaders/local.py
Outdated
| # ubi7.1. | ||
| version = os.path.basename(os.path.dirname(os.path.abspath(file_path))) | ||
|
|
||
| if not re.search(r"ubi[0-9]{1}\.?[0-9]{0,2}$", version): |
There was a problem hiding this comment.
hmm,
are you sure of this? It makes only dot optional.
Shouldn't it be:
ubi[0-9]{1}(\.[0-9]{0,2})?
There was a problem hiding this comment.
Hm, it should be r"ubi[0-9].[0-9]{1,2}$|ubi[0-9]$"
There was a problem hiding this comment.
what is allowed?
ubi7
ubi8
ubi7.1
ubi8.9
ubi7.10
I guess my regex would do the trick.
There was a problem hiding this comment.
not sure if ubi[0-9]{1}(.[0-9]{0,2}) is your last version, but if you do:
re.search(r'ubi[0-9]{1}(.[0-9]{0,2})', 'ubi8')
If I change it to 'ubi[0-9]{1}(.[0-9]){0,3}':
re.search(r'ubi[0-9]{1}(.[0-9]){0,3}', 'ubi710')
<_sre.SRE_Match object at 0x7f79f1819558> # shouldn't match.
There was a problem hiding this comment.
@JayZ12138
next time let's code formatter in comment, otherwise it can strip out some chars
I was wrong before:
the shortest correct should be:
r'ubi[0-9](\.[0-9]{1,2})?$'
When version is None, it wrongly tries to get version from filename instead of the file path.