Skip to content

Fix adobe reader int/str to NoneType comparisons as well as other identified cases #9881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
feerrenrut merged 6 commits into from
Jul 11, 2019
Merged

Fix adobe reader int/str to NoneType comparisons as well as other identified cases #9881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
02b2b6d
Fix adobe reader int to NoneType comparison as well as other identifi…
Jul 5, 2019
ef432b8
Fix problem for Acrobat in normalizeStdName
Jul 6, 2019
5e4796d
Another attempt to fix Adobe
Jul 6, 2019
c9d1c15
Log debugWarning for role fetching errors
Jul 9, 2019
83aa51a
Avoid raising TypeError
Jul 9, 2019
0c944a4
Fix rowspan en columnspan in braille. Fix from #9794
Jul 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/NVDAObjects/IAccessible/MSHTML.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,7 @@ def findExtraIAccessibleOverlayClasses(obj, clsList):
clsList.append(MSAATextLeaf)
return

if iaRole == oleacc.ROLE_SYSTEM_WINDOW and obj.event_objectID > 0:
if iaRole == oleacc.ROLE_SYSTEM_WINDOW and obj.event_objectID is not None and obj.event_objectID > 0:
clsList.append(PluginWindow)
elif iaRole == oleacc.ROLE_SYSTEM_CLIENT and obj.event_objectID == winUser.OBJID_CLIENT:
clsList.append(RootClient)
6 changes: 3 additions & 3 deletions source/NVDAObjects/IAccessible/adobeAcrobat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
}

def normalizeStdName(stdName):
if "H1" <= stdName <= "H6":
if stdName and "H1" <= stdName <= "H6":
return controlTypes.ROLE_HEADING, stdName[1]

try:
Expand All @@ -58,9 +58,9 @@ def initOverlayClass(self):
log.debugWarning("Could not get IServiceProvider")
return

if self.event_objectID > 0:
if self.event_objectID is not None and self.event_objectID > 0:
self.accID = self.event_objectID
elif self.event_childID > 0:
elif self.event_childID is not None and self.event_childID > 0:
self.accID = self.event_childID
else:
try:
Expand Down
7 changes: 5 additions & 2 deletions source/braille.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,11 @@ def getBrailleTextForProperties(**propertyValues):
cellCoordsText=propertyValues.get('cellCoordsText')
rowNumber = propertyValues.get("rowNumber")
columnNumber = propertyValues.get("columnNumber")
rowSpan = propertyValues.get("rowSpan")
columnSpan = propertyValues.get("columnSpan")
# When fetching row and column span
# default the values to 1 to make further checks a lot simpler.
# After all, a table cell that has no rowspan implemented is assumed to span one row.
rowSpan = propertyValues.get("rowSpan") or 1
columnSpan = propertyValues.get("columnSpan") or 1
includeTableCellCoords = propertyValues.get("includeTableCellCoords", True)
if role is not None and not roleText:
if role == controlTypes.ROLE_HEADING and level:
Expand Down
2 changes: 1 addition & 1 deletion source/virtualBuffers/adobeFlash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class AdobeFlash(VirtualBuffer):

def __init__(self,rootNVDAObject):
super(AdobeFlash,self).__init__(rootNVDAObject,backendName="adobeFlash")
self.isWindowless = rootNVDAObject.event_objectID > 0
self.isWindowless = rootNVDAObject.event_objectID is not None and rootNVDAObject.event_objectID > 0

def __contains__(self,obj):
if self.isWindowless:
Expand Down