Skip to content

Commit b0170a8

Browse files
committed
[version_converter] Reduce Redundancy
Reduce redundancy in _add_id.
1 parent 34260a3 commit b0170a8

File tree

1 file changed

+11
-16
lines changed

1 file changed

+11
-16
lines changed

odml/tools/version_converter.py

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -432,27 +432,22 @@ def _check_add_ids(self, tree):
432432

433433
@staticmethod
434434
def _add_id(element):
435+
435436
"""
436-
Checks, whether element possesses ID. If yes, make sure, it has right format.
437-
Otherwise a new UUID is created.
437+
Checks, whether an element possesses an ID. If yes, make sure it has
438+
the right format. Otherwise a new UUID is created.
438439
:param element: lxml element.
439440
"""
440441
oid = element.find("id")
441442
new_id = ET.Element("id")
442-
try:
443-
if oid is not None:
444-
try:
445-
if oid.text is not None:
446-
new_id.text = str(uuid.UUID(oid.text))
447-
except ValueError as e:
448-
print(e)
449-
new_id.text = str(uuid.uuid4())
450-
element.remove(oid)
451-
else:
452-
new_id.text = str(uuid.uuid4())
453-
except ValueError as e:
454-
print(e)
455-
new_id.text = str(uuid.uuid4())
443+
new_id.text = str(uuid.uuid4())
444+
if oid is not None:
445+
try:
446+
if oid.text is not None:
447+
new_id.text = str(uuid.UUID(oid.text))
448+
except ValueError as e:
449+
print(e)
450+
element.remove(oid)
456451
element.append(new_id)
457452

458453
def _log(self, msg):

0 commit comments

Comments
 (0)