Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/142'

Browse Source 
* origin/pr/142:
  Opens services file as utf-8 even in edge cases
This commit is contained in:
Marek Marczykowski-Górecki 2019-01-16 00:33:11 +01:00
commit 4c3de619fc
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qubesmanager/firewall.py
View File

@ -138,6 +138,7 @@ class NewFwRuleDlg(QtGui.QDialog, ui_newfwruledlg.Ui_NewFwRuleDlg):
if checked: if checked:
self.serviceComboBox.setEnabled(False) self.serviceComboBox.setEnabled(False)
class QubesFirewallRulesModel(QtCore.QAbstractItemModel): class QubesFirewallRulesModel(QtCore.QAbstractItemModel):
def __init__(self, parent=None): def __init__(self, parent=None):
QtCore.QAbstractItemModel.__init__(self, parent) QtCore.QAbstractItemModel.__init__(self, parent)
@ -148,7 +149,7 @@ class QubesFirewallRulesModel(QtCore.QAbstractItemModel):
r"(?P<name>[a-z][a-z0-9-]+)\s+(?P<port>[0-9]+)/" r"(?P<name>[a-z][a-z0-9-]+)\s+(?P<port>[0-9]+)/"
r"(?P<protocol>[a-z]+)", r"(?P<protocol>[a-z]+)",
re.IGNORECASE) re.IGNORECASE)
with open('/etc/services', 'r') as file: with open('/etc/services', 'r', encoding='utf-8') as file:
for line in file: for line in file:
match = pattern.match(line) match = pattern.match(line)
if match is not None: if match is not None: