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

setoolsgui models: fix header defaultdicts factory methods

Browse Source 
Setting a None factory makes it work like a standard dictionary.  Use str
instead to get empty strings.
This commit is contained in:
Chris PeBenito 2016-03-29 11:11:21 -04:00
parent b1c6652de0
commit 17fdfc6012
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setoolsgui/boolmodel.py
View File

@ -44,7 +44,7 @@ class BooleanTableModel(QAbstractTableModel):
"""Table-based model for booleans.""" """Table-based model for booleans."""
headers = defaultdict(None, {0: "Name", 1: "Default State"}) headers = defaultdict(str, {0: "Name", 1: "Default State"})
def __init__(self, parent): def __init__(self, parent):
super(BooleanTableModel, self).__init__(parent) super(BooleanTableModel, self).__init__(parent)

2
setoolsgui/rolemodel.py
View File

@ -50,7 +50,7 @@ class RoleTableModel(QAbstractTableModel):
"""Table-based model for roles.""" """Table-based model for roles."""
headers = defaultdict(None, {0: "Name", 1: "Types"}) headers = defaultdict(str, {0: "Name", 1: "Types"})
def __init__(self, parent): def __init__(self, parent):
super(RoleTableModel, self).__init__(parent) super(RoleTableModel, self).__init__(parent)

14
setoolsgui/rulemodels.py
View File

@ -53,8 +53,8 @@ class MLSRuleListModel(RuleListModel):
"""MLS rule model. Represents rules as a column.""" """MLS rule model. Represents rules as a column."""
headers = defaultdict(None, {0: "Rule Type", 1: "Source", 2: "Target", headers = defaultdict(str, {0: "Rule Type", 1: "Source", 2: "Target",
3: "Object Class", 4: "Default Range"}) 3: "Object Class", 4: "Default Range"})
def data(self, index, role): def data(self, index, role):
if self.resultlist: if self.resultlist:
@ -82,8 +82,8 @@ class RBACRuleListModel(RuleListModel):
"""RBAC rule model. Represents rules as a column.""" """RBAC rule model. Represents rules as a column."""
headers = defaultdict(None, {0: "Rule Type", 1: "Source", 2: "Target", headers = defaultdict(str, {0: "Rule Type", 1: "Source", 2: "Target",
3: "Object Class", 4: "Default Role"}) 3: "Object Class", 4: "Default Role"})
def data(self, index, role): def data(self, index, role):
if self.resultlist: if self.resultlist:
@ -119,9 +119,9 @@ class TERuleListModel(RuleListModel):
"""Type Enforcement rule model. Represents rules as a column.""" """Type Enforcement rule model. Represents rules as a column."""
headers = defaultdict(None, {0: "Rule Type", 1: "Source", 2: "Target", headers = defaultdict(str, {0: "Rule Type", 1: "Source", 2: "Target",
3: "Object Class", 4: "Permissions/Default Type", 3: "Object Class", 4: "Permissions/Default Type",
5: "Conditional Expression", 6: "Conditional Block"}) 5: "Conditional Expression", 6: "Conditional Block"})
def columnCount(self, parent=QModelIndex()): def columnCount(self, parent=QModelIndex()):
return 7 return 7

2
setoolsgui/typeattrmodel.py
View File

@ -50,7 +50,7 @@ class TypeAttributeTableModel(QAbstractTableModel):
"""Table-based model for roles.""" """Table-based model for roles."""
headers = defaultdict(None, {0: "Name", 1: "Types"}) headers = defaultdict(str, {0: "Name", 1: "Types"})
def __init__(self, parent): def __init__(self, parent):
super(TypeAttributeTableModel, self).__init__(parent) super(TypeAttributeTableModel, self).__init__(parent)

2
setoolsgui/typemodel.py
View File

@ -56,7 +56,7 @@ class TypeTableModel(QAbstractTableModel):
"""Table-based model for types.""" """Table-based model for types."""
headers = defaultdict(None, {0: "Name", 1: "Attributes", 2: "Aliases", 3: "Permissive"}) headers = defaultdict(str, {0: "Name", 1: "Attributes", 2: "Aliases", 3: "Permissive"})
def __init__(self, parent): def __init__(self, parent):
super(TypeTableModel, self).__init__(parent) super(TypeTableModel, self).__init__(parent)

2
setoolsgui/usermodel.py
View File

@ -59,7 +59,7 @@ class UserTableModel(QAbstractTableModel):
"""Table-based model for users.""" """Table-based model for users."""
headers = defaultdict(None, {0: "Name", 1: "Roles", 2: "Default Level", 3: "Range"}) headers = defaultdict(str, {0: "Name", 1: "Roles", 2: "Default Level", 3: "Range"})
def __init__(self, parent, mls): def __init__(self, parent, mls):
super(UserTableModel, self).__init__(parent) super(UserTableModel, self).__init__(parent)