diff options
-rw-r--r-- | python/ldtp.py | 304 | ||||
-rwxr-xr-x | python/ldtp2 | 2 | ||||
-rw-r--r-- | python/ldtplib/ldtplibutils.py | 21 | ||||
-rw-r--r-- | python/ldtplib/libldtpcodegen.py | 2 | ||||
-rwxr-xr-x | python/ldtprunner | 6 |
5 files changed, 163 insertions, 172 deletions
diff --git a/python/ldtp.py b/python/ldtp.py index e081306..f2a8573 100644 --- a/python/ldtp.py +++ b/python/ldtp.py @@ -300,7 +300,7 @@ def getresponse (packetId = None, sockfd = None, timeOut = True): _responsePacket = recvpacket (sockfd = sockfd) break except LdtpExecutionError, msg: - if msg.value == 'Timeout': + if str(msg) == 'Timeout': if timeOut is False: # don't timeout, so don't increase the count ! continue @@ -409,7 +409,7 @@ def selectevent (windowName, componentName, calendarEventName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selectevent failed: %s' % msg.value) + logFailures ('selectevent failed: %s' % str(msg)) raise def selecteventindex (windowName, componentName, eventNumber): @@ -426,7 +426,7 @@ def selecteventindex (windowName, componentName, eventNumber): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selecteventindex failed: %s' % msg.value) + logFailures ('selecteventindex failed: %s' % str(msg)) raise def verifyeventexist (windowName, componentName): @@ -445,7 +445,7 @@ def verifyeventexist (windowName, componentName): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('verifyeventexist failed: %s' % msg.value, + logFailures ('verifyeventexist failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -466,7 +466,7 @@ def ischildselected (windowName, componentName, item): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('ischildselected failed: %s' % msg.value, + logFailures ('ischildselected failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -488,7 +488,7 @@ def ischilditemselected (windowName, componentName, item): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('ischilditemselected failed: %s' % msg.value, + logFailures ('ischilditemselected failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -509,7 +509,7 @@ def ischildindexselected (windowName, componentName, index): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('ischildindexselected failed: %s' % msg.value, + logFailures ('ischildindexselected failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -531,7 +531,7 @@ def ischilditemindexselected (windowName, componentName, index): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('ischilditemindexselected failed: %s' % msg.value, + logFailures ('ischilditemindexselected failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -549,7 +549,7 @@ def check (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('check failed: %s' % msg.value) + logFailures ('check failed: %s' % str(msg)) raise def uncheck (windowName, componentName): @@ -566,7 +566,7 @@ def uncheck (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('uncheck failed: %s' % msg.value) + logFailures ('uncheck failed: %s' % str(msg)) raise def click (windowName, componentName): @@ -583,7 +583,7 @@ def click (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('click failed: %s' % msg.value) + logFailures ('click failed: %s' % str(msg)) raise def press (windowName, componentName): @@ -600,7 +600,7 @@ def press (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('press failed: %s' % msg.value) + logFailures ('press failed: %s' % str(msg)) raise def menucheck (windowName, componentName): @@ -617,7 +617,7 @@ def menucheck (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('menucheck failed: %s' % msg.value) + logFailures ('menucheck failed: %s' % str(msg)) raise def menuuncheck (windowName, componentName): @@ -634,7 +634,7 @@ def menuuncheck (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('menuuncheck failed: %s' % msg.value) + logFailures ('menuuncheck failed: %s' % str(msg)) raise def verifycheck (windowName, componentName): @@ -653,7 +653,7 @@ def verifycheck (windowName, componentName): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('verifycheck failed: %s' % msg.value, + logFailures ('verifycheck failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -673,7 +673,7 @@ def verifyuncheck (windowName, componentName): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('verifyuncheck failed: %s' % msg.value, + logFailures ('verifyuncheck failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -693,7 +693,7 @@ def menuitemenabled (windowName, menuItem): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('menuitemenabled failed: %s' % msg.value, + logFailures ('menuitemenabled failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -713,7 +713,7 @@ def verifymenucheck (windowName, menuItem): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('verifymenucheck failed: %s' % msg.value, + logFailures ('verifymenucheck failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -733,7 +733,7 @@ def verifymenuuncheck (windowName, menuItem): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('verifymenuuncheck failed: %s' % msg.value, + logFailures ('verifymenuuncheck failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -753,7 +753,7 @@ def verifydropdown (windowName, componentName): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('verifydropdown failed: %s' % msg.value, + logFailures ('verifydropdown failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -773,7 +773,7 @@ def selectmenuitem (windowName, menuHierarchy): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selectmenuitem failed: %s' % msg.value) + logFailures ('selectmenuitem failed: %s' % str(msg)) raise # Combobox Functions @@ -796,7 +796,7 @@ def hidelist (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('hidelist failed: %s' % msg.value) + logFailures ('hidelist failed: %s' % str(msg)) raise def selectindex (windowName, componentName, index): @@ -813,7 +813,7 @@ def selectindex (windowName, componentName, index): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selectindex failed: %s' % msg.value) + logFailures ('selectindex failed: %s' % str(msg)) raise def unselectindex (windowName, componentName, index): @@ -833,7 +833,7 @@ def unselectindex (windowName, componentName, index): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('unselectindex failed: %s' % msg.value) + logFailures ('unselectindex failed: %s' % str(msg)) raise def unselectitemindex (windowName, componentName, index): @@ -853,7 +853,7 @@ def unselectitemindex (windowName, componentName, index): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('unselectitemindex failed: %s' % msg.value) + logFailures ('unselectitemindex failed: %s' % str(msg)) raise def settextvalue (windowName, componentName, text): @@ -872,7 +872,7 @@ def settextvalue (windowName, componentName, text): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('settextvalue failed: %s' % msg.value) + logFailures ('settextvalue failed: %s' % str(msg)) raise def gettextvalue (windowName, componentName, startPosition = None, endPosition = None): @@ -895,7 +895,7 @@ def gettextvalue (windowName, componentName, startPosition = None, endPosition = raise LdtpExecutionError (_responseStatus [1]) return _responseData [1] except LdtpExecutionError, msg: - logFailures ('gettextvalue failed: %s' % msg.value) + logFailures ('gettextvalue failed: %s' % str(msg)) raise def activatetext (windowName, componentName): @@ -912,7 +912,7 @@ def activatetext (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('activatetext failed: %s' % msg.value) + logFailures ('activatetext failed: %s' % str(msg)) raise def appendtext (windowName, componentName, text): @@ -929,7 +929,7 @@ def appendtext (windowName, componentName, text): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('appendtext failed: %s' % msg.value) + logFailures ('appendtext failed: %s' % str(msg)) raise def getcursorposition (windowName, componentName): @@ -947,7 +947,7 @@ def getcursorposition (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return long (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('getcursorposition failed: %s' % msg.value) + logFailures ('getcursorposition failed: %s' % str(msg)) raise def setcursorposition (windowName, componentName, position): @@ -966,7 +966,7 @@ def setcursorposition (windowName, componentName, position): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('setcursorposition failed: %s' % msg.value) + logFailures ('setcursorposition failed: %s' % str(msg)) raise def capturetofile (windowName, componentName, fileName = None): @@ -983,7 +983,7 @@ def capturetofile (windowName, componentName, fileName = None): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('capturetofile failed: %s' % msg.value) + logFailures ('capturetofile failed: %s' % str(msg)) raise def showlist (windowName, componentName): @@ -1000,7 +1000,7 @@ def showlist (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('showlist failed: %s' % msg.value) + logFailures ('showlist failed: %s' % str(msg)) raise def verifyhidelist (windowName, componentName): @@ -1019,7 +1019,7 @@ def verifyhidelist (windowName, componentName): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('verifyhidelist failed: %s' % msg.value, + logFailures ('verifyhidelist failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -1040,7 +1040,7 @@ def verifyselect (windowName, componentName, selectArgument): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('verifyselect failed: %s' % msg.value, + logFailures ('verifyselect failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -1060,7 +1060,7 @@ def verifysettext (windowName, componentName, text): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('verifysettext failed: %s' % msg.value, + logFailures ('verifysettext failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -1082,7 +1082,7 @@ def verifyshowlist (windowName, componentName): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('verifyshowlist failed: %s' % msg.value, + logFailures ('verifyshowlist failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -1100,7 +1100,7 @@ def comboselect (windowName, componentName, menuItemName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('comboselect failed: %s' % msg.value) + logFailures ('comboselect failed: %s' % str(msg)) raise def comboselectindex (windowName, componentName, index): @@ -1118,7 +1118,7 @@ def comboselectindex (windowName, componentName, index): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('comboselectindex failed: %s' % msg.value) + logFailures ('comboselectindex failed: %s' % str(msg)) raise def comparetextproperty (windowName, componentName, textProperty, @@ -1143,7 +1143,7 @@ def comparetextproperty (windowName, componentName, textProperty, return 0 return 1 except LdtpExecutionError, msg: - logFailures ('comparetextproperty failed: %s' % msg.value, + logFailures ('comparetextproperty failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -1170,7 +1170,7 @@ def containstextproperty (windowName, componentName, textProperty, return 0 return 1 except LdtpExecutionError, msg: - logFailures ('containstextproperty failed: %s' % msg.value, + logFailures ('containstextproperty failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -1192,7 +1192,7 @@ def gettextproperty (windowName, componentName, startPosition = None, endPositio raise LdtpExecutionError (_responseStatus [1]) return _responseData [1] except LdtpExecutionError, msg: - logFailures ('gettextproperty failed: %s' % msg.value) + logFailures ('gettextproperty failed: %s' % str(msg)) raise def copytext (windowName, componentName, startPosition = None, endPosition = None): @@ -1213,7 +1213,7 @@ def copytext (windowName, componentName, startPosition = None, endPosition = Non raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('copytext failed: %s' % msg.value) + logFailures ('copytext failed: %s' % str(msg)) raise def cuttext (windowName, componentName, startPosition = None, endPosition = None): @@ -1234,7 +1234,7 @@ def cuttext (windowName, componentName, startPosition = None, endPosition = None raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('cuttext failed: %s' % msg.value) + logFailures ('cuttext failed: %s' % str(msg)) raise def inserttext (windowName, componentName, position, text): @@ -1251,7 +1251,7 @@ def inserttext (windowName, componentName, position, text): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('inserttext failed: %s' % msg.value) + logFailures ('inserttext failed: %s' % str(msg)) raise def deletetext (windowName, componentName, startPosition = None, endPosition = None): @@ -1272,7 +1272,7 @@ def deletetext (windowName, componentName, startPosition = None, endPosition = N raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('deletetext failed: %s' % msg.value) + logFailures ('deletetext failed: %s' % str(msg)) raise def selecttextbyindexandregion (windowName, componentName, @@ -1297,7 +1297,7 @@ def selecttextbyindexandregion (windowName, componentName, raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selecttextbyindexandregion failed: %s' % msg.value) + logFailures ('selecttextbyindexandregion failed: %s' % str(msg)) raise def selecttextbyname (windowName, componentName): @@ -1314,7 +1314,7 @@ def selecttextbyname (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selecttextbyname failed: %s' % msg.value) + logFailures ('selecttextbyname failed: %s' % str(msg)) raise def pastetext (windowName, componentName, position = None): @@ -1333,7 +1333,7 @@ def pastetext (windowName, componentName, position = None): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('pastetext failed: %s' % msg.value) + logFailures ('pastetext failed: %s' % str(msg)) raise def expandtablecell (windowName, componentName, position): @@ -1350,7 +1350,7 @@ def expandtablecell (windowName, componentName, position): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('expandtablecell failed: %s' % msg.value) + logFailures ('expandtablecell failed: %s' % str(msg)) raise def getcharcount (windowName, componentName): @@ -1367,7 +1367,7 @@ def getcharcount (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return int (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('getcharcount failed: %s' % msg.value) + logFailures ('getcharcount failed: %s' % str(msg)) raise def getlabel (windowName, componentName): @@ -1384,7 +1384,7 @@ def getlabel (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return _responseData [1] except LdtpExecutionError, msg: - logFailures ('getlabel failed: %s' % msg.value) + logFailures ('getlabel failed: %s' % str(msg)) raise def getlabelatindex (windowName, componentName, index): @@ -1401,7 +1401,7 @@ def getlabelatindex (windowName, componentName, index): raise LdtpExecutionError (_responseStatus [1]) return _responseData [1] except LdtpExecutionError, msg: - logFailures ('getlabelatindex failed: %s' % msg.value) + logFailures ('getlabelatindex failed: %s' % str(msg)) raise def selectlabelspanelbyname (windowName, labelName): @@ -1418,7 +1418,7 @@ def selectlabelspanelbyname (windowName, labelName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selectlabelspanelbyname failed: %s' % msg.value) + logFailures ('selectlabelspanelbyname failed: %s' % str(msg)) raise def getpanelchildcount (windowName, componentName): @@ -1435,7 +1435,7 @@ def getpanelchildcount (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return int (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('getpanelchildcount failed: %s' % msg.value) + logFailures ('getpanelchildcount failed: %s' % str(msg)) raise def selecteditemcount (windowName, componentName): @@ -1455,7 +1455,7 @@ def selecteditemcount (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return int (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('selecteditemcount failed: %s' % msg.value) + logFailures ('selecteditemcount failed: %s' % str(msg)) raise def getslidervalue (windowName, componentName): @@ -1472,7 +1472,7 @@ def getslidervalue (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return float (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('getslidervalue failed: %s' % msg.value) + logFailures ('getslidervalue failed: %s' % str(msg)) raise def getstatusbartext (windowName, componentName): @@ -1489,7 +1489,7 @@ def getstatusbartext (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return _responseData [1] except LdtpExecutionError, msg: - logFailures ('getstatusbartext failed: %s' % msg.value) + logFailures ('getstatusbartext failed: %s' % str(msg)) raise def gettreetablerowindex (windowName, componentName, rowText): @@ -1506,7 +1506,7 @@ def gettreetablerowindex (windowName, componentName, rowText): raise LdtpExecutionError (_responseStatus [1]) return int (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('gettreetablerowindex failed: %s' % msg.value) + logFailures ('gettreetablerowindex failed: %s' % str(msg)) raise def grabfocus (windowName, componentName = None): @@ -1526,7 +1526,7 @@ def grabfocus (windowName, componentName = None): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('grabfocus failed: %s' % msg.value) + logFailures ('grabfocus failed: %s' % str(msg)) raise def istextstateenabled (windowName, componentName): @@ -1545,7 +1545,7 @@ def istextstateenabled (windowName, componentName): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('istextstateenabled failed: %s' % msg.value, + logFailures ('istextstateenabled failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -1563,7 +1563,7 @@ def listsubmenus (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return _responseData [1] except LdtpExecutionError, msg: - logFailures ('listsubmenus failed: %s' % msg.value) + logFailures ('listsubmenus failed: %s' % str(msg)) raise def invokemenu (windowName, componentName): @@ -1580,7 +1580,7 @@ def invokemenu (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return _responseData [1] except LdtpExecutionError, msg: - logFailures ('invokemenu failed: %s' % msg.value) + logFailures ('invokemenu failed: %s' % str(msg)) raise def rightclick (windowName, componentName, data = None): @@ -1598,7 +1598,7 @@ def rightclick (windowName, componentName, data = None): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('rightclick failed: %s' % msg.value) + logFailures ('rightclick failed: %s' % str(msg)) raise def selectcalendardate (windowName, componentName, day, month, year): @@ -1615,7 +1615,7 @@ def selectcalendardate (windowName, componentName, day, month, year): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selectcalendardate failed: %s' % msg.value) + logFailures ('selectcalendardate failed: %s' % str(msg)) raise def selectitem (windowName, componentName, item): @@ -1632,7 +1632,7 @@ def selectitem (windowName, componentName, item): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selectitem failed: %s' % msg.value) + logFailures ('selectitem failed: %s' % str(msg)) raise def unselectitem (windowName, componentName, item): @@ -1649,7 +1649,7 @@ def unselectitem (windowName, componentName, item): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('unselectitem failed: %s' % msg.value) + logFailures ('unselectitem failed: %s' % str(msg)) raise def selectall (windowName, componentName): @@ -1666,7 +1666,7 @@ def selectall (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selectall failed: %s' % msg.value) + logFailures ('selectall failed: %s' % str(msg)) raise def unselectall (windowName, componentName): @@ -1683,7 +1683,7 @@ def unselectall (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('unselectall failed: %s' % msg.value) + logFailures ('unselectall failed: %s' % str(msg)) raise def selecttextitem (windowName, componentName, item): @@ -1700,7 +1700,7 @@ def selecttextitem (windowName, componentName, item): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selecttextitem failed: %s' % msg.value) + logFailures ('selecttextitem failed: %s' % str(msg)) raise def setcellvalue (windowName, componentName, row, column, item): @@ -1718,7 +1718,7 @@ def setcellvalue (windowName, componentName, row, column, item): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('setcellvalue failed: %s' % msg.value) + logFailures ('setcellvalue failed: %s' % str(msg)) raise def sortcolumn (windowName, componentName, item): @@ -1735,7 +1735,7 @@ def sortcolumn (windowName, componentName, item): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('sortcolumn failed: %s' % msg.value) + logFailures ('sortcolumn failed: %s' % str(msg)) raise def sortcolumnindex (windowName, componentName, index): @@ -1752,7 +1752,7 @@ def sortcolumnindex (windowName, componentName, index): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('sortcolumnindex failed: %s' % msg.value) + logFailures ('sortcolumnindex failed: %s' % str(msg)) raise def verifybuttoncount (windowName, componentName, count): @@ -1771,7 +1771,7 @@ def verifybuttoncount (windowName, componentName, count): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('verifybuttoncount failed: %s' % msg.value, + logFailures ('verifybuttoncount failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -1803,7 +1803,7 @@ def waittillguiexist (windowName, componentName = '', guiTimeOut = None): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('waittillguiexist failed: %s' % msg.value, + logFailures ('waittillguiexist failed: %s' % str(msg), screenshot = False, logStatus = "warning") raise @@ -1832,7 +1832,7 @@ def waittillguinotexist (windowName, componentName = '', guiTimeOut = None): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('waittillguinotexist failed: %s' % msg.value, + logFailures ('waittillguinotexist failed: %s' % str(msg), screenshot = False, logStatus = "warning") raise @@ -1853,7 +1853,7 @@ def guiexist (windowName, componentName = ''): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('guiexist failed: %s' % msg.value, + logFailures ('guiexist failed: %s' % str(msg), screenshot = False, logStatus = "warning") raise @@ -1881,7 +1881,7 @@ def guitimeout (guiTimeOut = 30): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('guitimeout failed: %s' % msg.value, + logFailures ('guitimeout failed: %s' % str(msg), screenshot = False, logStatus = "warning") raise @@ -1907,7 +1907,7 @@ def objtimeout (objTimeOut = 5): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('objtimeout failed: %s' % msg.value, + logFailures ('objtimeout failed: %s' % str(msg), screenshot = False, logStatus = "warning") raise @@ -1938,7 +1938,7 @@ def initappmap (appmapFileName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('initappmap failed: %s' % msg.value) + logFailures ('initappmap failed: %s' % str(msg)) raise def setappmap (appmapFileName): @@ -1955,7 +1955,7 @@ def setappmap (appmapFileName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('setappmap failed: %s' % msg.value) + logFailures ('setappmap failed: %s' % str(msg)) raise def setcontext (oldContext, newContext): @@ -1973,7 +1973,7 @@ def setcontext (oldContext, newContext): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('setcontext failed: %s' % msg.value) + logFailures ('setcontext failed: %s' % str(msg)) raise def releasecontext (oldContext = "", newContext = ""): @@ -1991,7 +1991,7 @@ def releasecontext (oldContext = "", newContext = ""): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('releasecontext failed: %s' % msg.value) + logFailures ('releasecontext failed: %s' % str(msg)) raise def onwindowcreate (windowTitle, callbackFuncName, *args): @@ -2016,7 +2016,7 @@ def onwindowcreate (windowTitle, callbackFuncName, *args): _callbackFunctions [windowTitle] = [callbackFuncName, threadId] return 1 except LdtpExecutionError, msg: - logFailures ('onwindowcreate failed: %s' % msg.value, + logFailures ('onwindowcreate failed: %s' % str(msg), screenshot = False, logStatus = "warning") raise @@ -2039,7 +2039,7 @@ def removecallback (windowTitle): raise LdtpExecutionError(_responseStatus[1]) return 1 except LdtpExecutionError, msg: - logFailures('removecallback failed: %s' % msg.value) + logFailures('removecallback failed: %s' % str(msg)) raise def reinitldtp (): @@ -2058,7 +2058,7 @@ def reinitldtp (): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('reinitldtp failed: %s' % msg.value) + logFailures ('reinitldtp failed: %s' % str(msg)) raise def remap (windowName, componentName = ''): @@ -2081,7 +2081,7 @@ def remap (windowName, componentName = ''): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('remap failed: %s' % msg.value) + logFailures ('remap failed: %s' % str(msg)) raise # Deprecated undoremap function as it is no longer needed @@ -2237,7 +2237,7 @@ def selectrow (windowName, tableName, rowText, nthMatch = 0): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selectrow failed: %s' % msg.value) + logFailures ('selectrow failed: %s' % str(msg)) raise def selectrowindex (windowName, tableName, rowIndex): @@ -2254,7 +2254,7 @@ def selectrowindex (windowName, tableName, rowIndex): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selectrowindex failed: %s' % msg.value) + logFailures ('selectrowindex failed: %s' % str(msg)) raise # MenuItem Functions @@ -2291,7 +2291,7 @@ def selectpanel (windowName, componentName, panelNumber): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selectpanel failed: %s' % msg.value) + logFailures ('selectpanel failed: %s' % str(msg)) raise def selectpanelname (windowName, componentName, panelName): @@ -2308,7 +2308,7 @@ def selectpanelname (windowName, componentName, panelName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selectpanelname failed: %s' % msg.value) + logFailures ('selectpanelname failed: %s' % str(msg)) raise # PushButton Functions @@ -2362,7 +2362,7 @@ def onedown (windowName, componentName, iterations): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('onedown failed: %s' % msg.value) + logFailures ('onedown failed: %s' % str(msg)) raise def oneleft (windowName, componentName, iterations): @@ -2380,7 +2380,7 @@ def oneleft (windowName, componentName, iterations): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('oneleft failed: %s' % msg.value) + logFailures ('oneleft failed: %s' % str(msg)) raise def oneright (windowName, componentName, iterations): @@ -2398,7 +2398,7 @@ def oneright (windowName, componentName, iterations): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('oneright failed: %s' % msg.value) + logFailures ('oneright failed: %s' % str(msg)) raise def oneup (windowName, componentName, iterations): @@ -2416,7 +2416,7 @@ def oneup (windowName, componentName, iterations): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('oneup failed: %s' % msg.value) + logFailures ('oneup failed: %s' % str(msg)) raise def scrolldown (windowName, componentName): @@ -2433,7 +2433,7 @@ def scrolldown (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('scrolldown failed: %s' % msg.value) + logFailures ('scrolldown failed: %s' % str(msg)) raise def scrollleft (windowName, componentName): @@ -2450,7 +2450,7 @@ def scrollleft (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('scrollleft failed: %s' % msg.value) + logFailures ('scrollleft failed: %s' % str(msg)) raise def scrollright (windowName, componentName): @@ -2467,7 +2467,7 @@ def scrollright (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('scrollright failed: %s' % msg.value) + logFailures ('scrollright failed: %s' % str(msg)) raise def scrollup (windowName, componentName): @@ -2484,7 +2484,7 @@ def scrollup (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('scrollup failed: %s' % msg.value) + logFailures ('scrollup failed: %s' % str(msg)) raise def verifyscrollbar (windowName, componentName): @@ -2664,7 +2664,7 @@ def decrease (windowName, componentName, iterations): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('decrease failed: %s' % msg.value) + logFailures ('decrease failed: %s' % str(msg)) raise def increase (windowName, componentName, iterations): @@ -2682,7 +2682,7 @@ def increase (windowName, componentName, iterations): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('increase failed: %s' % msg.value) + logFailures ('increase failed: %s' % str(msg)) raise def setmax (windowName, componentName): @@ -2699,7 +2699,7 @@ def setmax (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('setmax failed: %s' % msg.value) + logFailures ('setmax failed: %s' % str(msg)) raise def setmin (windowName, componentName): @@ -2716,7 +2716,7 @@ def setmin (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('setmin failed: %s' % msg.value) + logFailures ('setmin failed: %s' % str(msg)) raise # SpinButton Functions @@ -2751,7 +2751,7 @@ def getvalue (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return float (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('getvalue failed: %s' % msg.value) + logFailures ('getvalue failed: %s' % str(msg)) raise def getminvalue (windowName, componentName): @@ -2768,7 +2768,7 @@ def getminvalue (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return float (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('getminvalue failed: %s' % msg.value) + logFailures ('getminvalue failed: %s' % str(msg)) raise def getminincrement (windowName, componentName): @@ -2785,7 +2785,7 @@ def getminincrement (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return float (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('getminincrement failed: %s' % msg.value) + logFailures ('getminincrement failed: %s' % str(msg)) raise def getmaxvalue (windowName, componentName): @@ -2802,7 +2802,7 @@ def getmaxvalue (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return float (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('getmaxvalue failed: %s' % msg.value) + logFailures ('getmaxvalue failed: %s' % str(msg)) raise def verifysetvalue (windowName, componentName, value) : @@ -2837,7 +2837,7 @@ def selecttab (windowName, componentName, tabName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selecttab failed: %s' % msg.value) + logFailures ('selecttab failed: %s' % str(msg)) raise def selecttabindex (windowName, componentName, tabIndex): @@ -2854,7 +2854,7 @@ def selecttabindex (windowName, componentName, tabIndex): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selecttabindex failed: %s' % msg.value) + logFailures ('selecttabindex failed: %s' % str(msg)) raise def gettabname (windowName, componentName, tabIndex): @@ -2871,7 +2871,7 @@ def gettabname (windowName, componentName, tabIndex): raise LdtpExecutionError (_responseStatus [1]) return _responseData [1] except LdtpExecutionError, msg: - logFailures ('gettabname failed: %s' % msg.value) + logFailures ('gettabname failed: %s' % str(msg)) raise def gettabcount (windowName, componentName): @@ -2889,7 +2889,7 @@ def gettabcount (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return long (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('gettabcount failed: %s' % msg.value) + logFailures ('gettabcount failed: %s' % str(msg)) raise def verifytabname (windowName, componentName, tabName): @@ -2908,7 +2908,7 @@ def verifytabname (windowName, componentName, tabName): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('verifytabname failed: %s' % msg.value, + logFailures ('verifytabname failed: %s' % str(msg), screenshot = False, logStatus = "warning") raise @@ -2929,7 +2929,7 @@ def checkrow (windowName, componentName, rowIndex, columnIndex = 0): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('checkrow failed: %s' % msg.value) + logFailures ('checkrow failed: %s' % str(msg)) raise def verifycheckrow (windowName, componentName, rowIndex, columnIndex = 0): @@ -2981,7 +2981,7 @@ def doubleclick (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('doubleclick failed: %s' % msg.value) + logFailures ('doubleclick failed: %s' % str(msg)) raise def doubleclickrow (windowName, componentName, rowText): @@ -2999,7 +2999,7 @@ def doubleclickrow (windowName, componentName, rowText): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('doubleclickrow failed: %s' % msg.value) + logFailures ('doubleclickrow failed: %s' % str(msg)) raise def doubleclickrowindex (windowName, componentName, rowIndex): @@ -3016,7 +3016,7 @@ def doubleclickrowindex (windowName, componentName, rowIndex): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('doubleclickrowindex failed: %s' % msg.value) + logFailures ('doubleclickrowindex failed: %s' % str(msg)) raise def singleclickrow (windowName, componentName, rowText): @@ -3034,7 +3034,7 @@ def singleclickrow (windowName, componentName, rowText): raise LdtpExecutionError(_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('singleclickrow failed: %s' % msg.value) + logFailures ('singleclickrow failed: %s' % str(msg)) raise def getcellvalue (windowName, componentName, row, column = 0): @@ -3051,7 +3051,7 @@ def getcellvalue (windowName, componentName, row, column = 0): raise LdtpExecutionError (_responseStatus [1]) return _responseData [1] except LdtpExecutionError, msg: - logFailures ('getcellvalue failed: %s' % msg.value) + logFailures ('getcellvalue failed: %s' % str(msg)) raise def getrowcount (windowName, componentName): @@ -3068,7 +3068,7 @@ def getrowcount (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return int (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('getrowcount failed: %s' % msg.value) + logFailures ('getrowcount failed: %s' % str(msg)) raise def gettablerowindex (windowName, componentName, rowText): @@ -3086,7 +3086,7 @@ def gettablerowindex (windowName, componentName, rowText): return -1L return long (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('gettablerowindex failed: %s' % msg.value) + logFailures ('gettablerowindex failed: %s' % str(msg)) raise def selectlastrow (windowName, componentName): @@ -3103,7 +3103,7 @@ def selectlastrow (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selectlastrow failed: %s' % msg.value) + logFailures ('selectlastrow failed: %s' % str(msg)) raise def selectrowpartialmatch (windowName, componentName, rowPartialText): @@ -3120,7 +3120,7 @@ def selectrowpartialmatch (windowName, componentName, rowPartialText): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('selectrowpartialmatch failed: %s' % msg.value) + logFailures ('selectrowpartialmatch failed: %s' % str(msg)) raise def verifypartialmatch (windowName, componentName, rowPartialText): @@ -3173,7 +3173,7 @@ def uncheckrow (windowName, componentName, rowIndex, columnIndex = 0): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('uncheckrow failed: %s' % msg.value) + logFailures ('uncheckrow failed: %s' % str(msg)) raise def verifyuncheckrow (windowName, componentName, rowIndex, columnIndex = 0): @@ -3192,7 +3192,7 @@ def verifyuncheckrow (windowName, componentName, rowIndex, columnIndex = 0): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('verifyuncheckrow failed: %s' % msg.value, + logFailures ('verifyuncheckrow failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -3214,7 +3214,7 @@ def verifytablecell (windowName, componentName, rowIndex, columnIndex, textToCom return 0 return 1 except LdtpExecutionError, msg: - logFailures ('verifytablecell failed: %s' % msg.value, + logFailures ('verifytablecell failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -3235,7 +3235,7 @@ def verifypartialcellvalue (windowName, componentName, rowIndex, columnIndex, pa return 0 return 1 except LdtpExecutionError, msg: - logFailures ('verifypartialcellvalue failed: %s' % msg.value, + logFailures ('verifypartialcellvalue failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -3258,7 +3258,7 @@ def getwindowsize (windowName): tmpList [i] = int (tmpList [i]) return tmpList except LdtpExecutionError, msg: - logFailures ('getwindowsize failed: %s' % msg.value, + logFailures ('getwindowsize failed: %s' % str(msg), screenshot = False) raise @@ -3281,7 +3281,7 @@ def getobjectsize (windowName, componentName): tmpList [i] = int (tmpList [i]) return tmpList except LdtpExecutionError, msg: - logFailures ('getobjectsize failed: %s' % msg.value, + logFailures ('getobjectsize failed: %s' % str(msg), screenshot = False) raise @@ -3299,7 +3299,7 @@ def getwindowlist (): raise LdtpExecutionError (_responseStatus [1]) return parseobjectlist (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('getwindowlist failed: %s' % msg.value, + logFailures ('getwindowlist failed: %s' % str(msg), screenshot = False) raise @@ -3317,7 +3317,7 @@ def getapplist (): raise LdtpExecutionError (_responseStatus [1]) return parseobjectlist (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('getapplist failed: %s' % msg.value, + logFailures ('getapplist failed: %s' % str(msg), screenshot = False) raise @@ -3340,7 +3340,7 @@ def getallstates (windowName, componentName = ''): index += 1 return _tmpList except LdtpExecutionError, msg: - logFailures ('getallstates failed: %s' % msg.value, + logFailures ('getallstates failed: %s' % str(msg), screenshot = False) raise @@ -3358,7 +3358,7 @@ def getobjectlist (windowName): raise LdtpExecutionError (_responseStatus [1]) return parseobjectlist (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('getobjectlist failed: %s' % msg.value) + logFailures ('getobjectlist failed: %s' % str(msg)) raise def getchild (windowName, componentName = '', role = '', parent = ''): @@ -3383,7 +3383,7 @@ def getchild (windowName, componentName = '', role = '', parent = ''): raise LdtpExecutionError (_responseStatus [1]) return parseobjectlist (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('getchild failed: %s' % msg.value) + logFailures ('getchild failed: %s' % str(msg)) raise def getobjectinfo (windowName, componentName): @@ -3402,7 +3402,7 @@ def getobjectinfo (windowName, componentName): componentName)) return parseobjectlist (_responseData [1]) except LdtpExecutionError, msg: - logFailures ('getobjectinfo failed: %s' % msg.value) + logFailures ('getobjectinfo failed: %s' % str(msg)) raise def getobjectproperty (windowName, componentName, propertyName): @@ -3421,7 +3421,7 @@ def getobjectproperty (windowName, componentName, propertyName): componentName, propertyName)) return _responseData [1] except LdtpExecutionError, msg: - logFailures ('getobjectproperty failed: %s' % msg.value, + logFailures ('getobjectproperty failed: %s' % str(msg), screenshot = False, logStatus = "warning") raise @@ -3439,7 +3439,7 @@ def setlocale (locale = None): if _responseStatus [0] != 0: raise LdtpExecutionError (_responseStatus [1]) except LdtpExecutionError, msg: - logFailures ('setlocale failed: %s' % msg.value, + logFailures ('setlocale failed: %s' % str(msg), screenshot = False) raise @@ -3457,7 +3457,7 @@ def bindtext (packageName, localeDir, mode = 'mo'): raise LdtpExecutionError (_responseStatus [1]) return _responseData [1] except LdtpExecutionError, msg: - logFailures ('bindtext failed: %s' % msg.value, + logFailures ('bindtext failed: %s' % str(msg), screenshot = False) raise @@ -3480,7 +3480,7 @@ def generatemouseevent (x, y, eventType = 'b1c'): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('generatemouseevent failed: %s' % msg.value) + logFailures ('generatemouseevent failed: %s' % str(msg)) raise def mouseleftclick (windowName, componentName): @@ -3498,7 +3498,7 @@ def mouseleftclick (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('mouseleftclick failed: %s' % msg.value) + logFailures ('mouseleftclick failed: %s' % str(msg)) raise def mouserightclick (windowName, componentName): @@ -3516,7 +3516,7 @@ def mouserightclick (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('mouserightclick failed: %s' % msg.value) + logFailures ('mouserightclick failed: %s' % str(msg)) raise def mousemove (windowName, componentName): @@ -3534,7 +3534,7 @@ def mousemove (windowName, componentName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('mousemove failed: %s' % msg.value) + logFailures ('mousemove failed: %s' % str(msg)) raise def enterstring (windowName, componentName = None, data = None): @@ -3564,7 +3564,7 @@ def enterstring (windowName, componentName = None, data = None): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('enterstring failed: %s' % msg.value) + logFailures ('enterstring failed: %s' % str(msg)) raise def generatekeyevent (data): @@ -3584,7 +3584,7 @@ def generatekeyevent (data): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('generatekeyevent failed: %s' % msg.value) + logFailures ('generatekeyevent failed: %s' % str(msg)) raise def keypress (data): @@ -3604,7 +3604,7 @@ def keypress (data): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('keypress failed: %s' % msg.value) + logFailures ('keypress failed: %s' % str(msg)) raise def keyrelease (data): @@ -3624,7 +3624,7 @@ def keyrelease (data): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('keyrelease failed: %s' % msg.value) + logFailures ('keyrelease failed: %s' % str(msg)) raise def stopscriptengine (): @@ -3638,7 +3638,7 @@ def stopscriptengine (): sendpacket (_message) _responseStatus, _responseData = getresponse (_requestId) except LdtpExecutionError, msg: - logFailures ('stopscriptengine failed: %s' % msg.value, + logFailures ('stopscriptengine failed: %s' % str(msg), screenshot = False, logStatus = "warning") pass @@ -3658,7 +3658,7 @@ def hasstate (windowName, componentName, *state): return 0 return 1 except LdtpExecutionError, msg: - logFailures ('hasstate failed: %s' % msg.value, + logFailures ('hasstate failed: %s' % str(msg), screenshot = False, logStatus = "warning") return 0 @@ -3744,7 +3744,7 @@ def titlebarselectmenuitem (windowName, componentName, *menupath): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('titlebarselect failed: %s' % msg.value) + logFailures ('titlebarselect failed: %s' % str(msg)) raise def getfile (pathtoget, pathtosave): @@ -3769,7 +3769,7 @@ def getfile (pathtoget, pathtosave): fp.write (data) fp.close () except LdtpExecutionError, msg: - logFailures ('getfile failed: %s' % msg.value, screenshot = False) + logFailures ('getfile failed: %s' % str(msg), screenshot = False) raise def generatemd5 (filepath): @@ -3782,7 +3782,7 @@ def generatemd5 (filepath): raise LdtpExecutionError (_responseStatus [1]) return _responseData [1] except LdtpExecutionError, msg: - logFailures ('generatemd5 failed: %s' % msg.value, screenshot = False) + logFailures ('generatemd5 failed: %s' % str(msg), screenshot = False) raise def appundertest (appName): @@ -3799,7 +3799,7 @@ def appundertest (appName): raise LdtpExecutionError (_responseStatus [1]) return 1 except LdtpExecutionError, msg: - logFailures ('appundertest failed: %s' % msg.value) + logFailures ('appundertest failed: %s' % str(msg)) raise def launchapp2 (appname, aut = None, callAut = False): @@ -3877,5 +3877,5 @@ def windowuptime(windowName): int(endTime[4]), int(endTime[5])) return _startTime, _endTime except LdtpExecutionError, msg: - logFailures ('windowuptime failed: %s' % msg.value) + logFailures ('windowuptime failed: %s' % str(msg)) raise diff --git a/python/ldtp2 b/python/ldtp2 index 8050c1a..8207d4f 100755 --- a/python/ldtp2 +++ b/python/ldtp2 @@ -240,7 +240,7 @@ class ClientThread: try: _requestPacket = self.packet.recv () except LdtpExecutionError, msg: - if msg.value == 'Timeout': + if str(msg) == 'Timeout': continue # Client connection broke # Let us close the socket diff --git a/python/ldtplib/ldtplibutils.py b/python/ldtplib/ldtplibutils.py index ac523af..75f5815 100644 --- a/python/ldtplib/ldtplibutils.py +++ b/python/ldtplib/ldtplibutils.py @@ -571,23 +571,14 @@ class XmlTags: NOTIFICATION_ELEMENT = "<NOTIFICATION>" NOTIFICATION_END_ELEMENT = "</NOTIFICATION>" -class error (Exception): - def __init__ (self, value): - self.value = value - def __str__ (self): - return repr (self.value) +class Error (Exception): + pass -class LdtpExecutionError (Exception): - def __init__ (self, value): - self.value = value - def __str__ (self): - return repr (self.value) +class LdtpExecutionError (Error): + pass -class ConnectionLost (Exception): - def __init__ (self, value): - self.value = value - def __str__ (self): - return repr (self.value) +class ConnectionLost (Error): + pass def connect2LdtpExecutionEngine (): _display = os.getenv ('DISPLAY') diff --git a/python/ldtplib/libldtpcodegen.py b/python/ldtplib/libldtpcodegen.py index 5c56607..a12e783 100644 --- a/python/ldtplib/libldtpcodegen.py +++ b/python/ldtplib/libldtpcodegen.py @@ -370,7 +370,7 @@ def getresponse (packetId = None, sockfd = None, timeOut = True): _responsePacket = recvpacket (sockfd = sockfd) break except LdtpExecutionError, msg: - if msg.value == 'Timeout': + if str(msg) == 'Timeout': if timeOut is False: # don't timeout, so don't increase the count ! continue diff --git a/python/ldtprunner b/python/ldtprunner index 8c3f2f5..1c43d7f 100755 --- a/python/ldtprunner +++ b/python/ldtprunner @@ -142,7 +142,7 @@ def executeldtp (ldtpxmldata): pass except ldtp.LdtpExecutionError, msg: # print 'appmap could not be initalize ' + msg.value - ldtp.log ('Appmap could not be initalized %s' % msg.value, 'error') + ldtp.log ('Appmap could not be initalized %s' % str(msg), 'error') try: appUnderTest = ldtpelements.getElementsByTagName ('appundertest')[0] appUnderTest = getText (appUnderTest.childNodes) @@ -439,7 +439,7 @@ def executescript (groupelements): pass except ldtp.LdtpExecutionError, msg: # print 'appmap could not be initalize ' + msg.value - ldtp.log ('Appmap could not be initalized %s' % msg.value, 'error') + ldtp.log ('Appmap could not be initalized %s' % str(msg), 'error') try: appUnderTest = scriptelements.getElementsByTagName ('appundertest')[0] appUnderTest = getText (appUnderTest.childNodes) @@ -475,7 +475,7 @@ def executescript (groupelements): getElapsedTime (time.time (), _startTime)), 'timeinfo') - msg = ErrorMsg.value# + traceback.print_exc () + msg = str(ErrorMsg)# + traceback.print_exc () # Escape unicode message replacequotes = re.compile ('\'u\"') msg = replacequotes.sub ('', msg) |