RepoMirrors/setools
1
0
Fork 0
mirror of https://github.com/SELinuxProject/setools synced 2025-02-23 07:37:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

setoolsgui: remove exceptions from models

Browse Source 
Occasionally Qt calls these methods with column -1 and this exception
otherwise goes unhandled.  The default None return from Python functions
should be sufficient.
This commit is contained in:
Chris PeBenito 2016-03-15 10:41:40 -04:00
parent fcabb2f0e6
commit 425e4f735b
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setoolsgui/rolemodel.py
View File

@ -80,8 +80,7 @@ class RoleTableModel(QAbstractTableModel):
return str(self.resultlist[row])
elif col == 1:
return ", ".join(sorted(str(t) for t in self.resultlist[row].types()))
else:
raise ValueError("Invalid column number: {0}".format(col))
elif role == Qt.UserRole:
# get the whole rule for role role
return self.resultlist[row].statement()

15
setoolsgui/rulemodels.py
View File

@ -61,8 +61,6 @@ class MLSRuleListModel(RuleListModel):
return "Object Class"
elif section == 4:
return "Default Range"
else:
raise ValueError("Invalid column number: {0}".format(section))
def data(self, index, role):
if role == Qt.DisplayRole:
@ -82,8 +80,7 @@ class MLSRuleListModel(RuleListModel):
return str(self.resultlist[row].tclass)
elif col == 4:
return str(self.resultlist[row].default)
else:
raise ValueError("Invalid column number: {0}".format(col))
elif role == Qt.UserRole:
# get the whole rule for user role
return self.resultlist[row].statement()
@ -105,8 +102,6 @@ class RBACRuleListModel(RuleListModel):
return "Object Class"
elif section == 4:
return "Default Role"
else:
raise ValueError("Invalid column number: {0}".format(section))
def data(self, index, role):
if role == Qt.DisplayRole:
@ -134,8 +129,7 @@ class RBACRuleListModel(RuleListModel):
return str(self.resultlist[row].default)
except RuleUseError:
return None
else:
raise ValueError("Invalid column number: {0}".format(col))
elif role == Qt.UserRole:
# get the whole rule for user role
return self.resultlist[row].statement()
@ -161,8 +155,6 @@ class TERuleListModel(RuleListModel):
return "Conditional Expression"
elif section == 6:
return "Conditional Block"
else:
raise ValueError("Invalid column number: {0}".format(section))
def columnCount(self, parent=QModelIndex()):
return 7
@ -198,8 +190,7 @@ class TERuleListModel(RuleListModel):
return str(self.resultlist[row].conditional_block)
except RuleNotConditional:
return None
else:
raise ValueError("Invalid column number: {0}".format(col))
elif role == Qt.UserRole:
# get the whole rule for user role
return self.resultlist[row].statement()

5
setoolsgui/usermodel.py
View File

@ -72,8 +72,6 @@ class UserTableModel(QAbstractTableModel):
return "Default Level"
elif section == 3:
return "Range"
else:
raise ValueError("Invalid column number: {0}".format(section))
def columnCount(self, parent=QModelIndex()):
if self.mls:
@ -109,8 +107,7 @@ class UserTableModel(QAbstractTableModel):
return str(self.resultlist[row].mls_range)
except MLSDisabled:
return None
else:
raise ValueError("Invalid column number: {0}".format(col))
elif role == Qt.UserRole:
# get the whole rule for user role
return self.resultlist[row].statement()