<Refactor>[]: <DRY>

[]

[#75]

Author: Humberto Sanchez II

src/untanglepyut/Common.py

@@ -10,6 +10,8 @@
 
 from untangle import Element
 
+from codeallybasic.SecureConversions import SecureConversions
+
 from miniogl.ControlPoint import ControlPoint
 
 from ogl.OglActor import OglActor
@@ -22,7 +24,6 @@
 from ogl.sd.OglSDInstance import OglSDInstance
 from ogl.sd.OglSDMessage import OglSDMessage
 
-from untanglepyut.Common import str2bool
 from untanglepyut.XmlVersion import XmlVersion
 
 UntangledControlPoints = NewType('UntangledControlPoints', List[ControlPoint])
@@ -172,7 +173,7 @@ def fromGraphicLink(cls, xmlVersion: XmlVersion, graphicLink: Element) -> 'Graph
             gla.dstX = int(graphicLink['destinationAnchorX'])
             gla.dstY = int(graphicLink['destinationAnchorY'])
 
-        gla.spline = str2bool(graphicLink['spline'])
+        gla.spline = SecureConversions.secureBoolean(graphicLink['spline'])
 
         return gla
 

src/untanglepyut/Types.py

@@ -10,6 +10,8 @@
 
 from untangle import Element
 
+from codeallybasic.SecureConversions import SecureConversions
+
 from pyutmodelv2.PyutField import PyutField
 from pyutmodelv2.PyutField import PyutFields
 
@@ -41,8 +43,7 @@
 from untanglepyut import XmlConstants
 
 from untanglepyut.XmlVersion import XmlVersion
-from untanglepyut.Common import secureInteger
-from untanglepyut.Common import str2bool
+
 from untanglepyut.Types import Elements
 
 
@@ -158,7 +159,7 @@ def classToPyutClass(self, graphicClass: Element) -> PyutClass:
 
     def textToPyutText(self, graphicText: Element) -> PyutText:
         """
-        Parses Text elements
+        Parses the Text elements
         Args:
             graphicText:   Of the form:   <Text id="3" content="I am standalone text"/>
 
@@ -249,7 +250,7 @@ def useCaseToPyutUseCase(self, graphicUseCase: Element) -> PyutUseCase:
         """
 
         Args:
-            graphicUseCase:  An untangle Element in the above format
+            graphicUseCase:  An `untangle` Element in the above format
 
         Returns:  PyutUseCase
         """
@@ -270,7 +271,7 @@ def linkToPyutLink(self, singleLink: Element, source: PyutClass, destination: Py
         linkType:        PyutLinkType = PyutLinkType.toEnum(linkTypeStr)
         cardSrc:         str          = singleLink[self._attrCardinalitySource]
         cardDest:        str          = singleLink[self._attrCardinalityDestination]
-        bidir:           bool         = str2bool(singleLink[self._attrBidirectional])
+        bidir:           bool         = SecureConversions.secureBoolean(singleLink[self._attrBidirectional])
         linkDescription: str          = singleLink['name']
 
         pyutLink: PyutLink = PyutLink(name=linkDescription,
@@ -292,7 +293,7 @@ def sdInstanceToPyutSDInstance(self, oglSDInstanceElement: Element) -> PyutSDIns
 
         pyutSDInstance.id                     = int(instanceElement['id'])
         pyutSDInstance.instanceName           = instanceElement['instanceName']
-        pyutSDInstance.instanceLifeLineLength = secureInteger(instanceElement['lifeLineLength'])
+        pyutSDInstance.instanceLifeLineLength = SecureConversions.secureInteger(instanceElement['lifeLineLength'])
 
         return pyutSDInstance
 
@@ -414,7 +415,7 @@ def _modifierToPyutMethodModifiers(self, methodElement: Element) -> PyutModifier
         Args:
             methodElement:
 
-        Returns:  PyutModifiers if not exist returns an empty
+        Returns:   A PyutModifiers object that may be empty.
         """
 
         modifierElements = methodElement.get_elements('Modifier')