diff options
| author | Papoteur <papoteur@mageia.org> | 2022-04-14 20:06:30 +0200 |
|---|---|---|
| committer | Papoteur <papoteur@mageia.org> | 2022-04-14 20:06:30 +0200 |
| commit | d7928e782dfc0edc4262389af4bbf6f602be22ed (patch) | |
| tree | 91e472ae7c15ae799e03209a959ec9bfd4cc9154 /src/msec/plugins/msec.py | |
| parent | 426ab9ba160fc0e16c7166a8087d686d90503b8f (diff) | |
| download | msec-d7928e782dfc0edc4262389af4bbf6f602be22ed.tar msec-d7928e782dfc0edc4262389af4bbf6f602be22ed.tar.gz msec-d7928e782dfc0edc4262389af4bbf6f602be22ed.tar.bz2 msec-d7928e782dfc0edc4262389af4bbf6f602be22ed.tar.xz msec-d7928e782dfc0edc4262389af4bbf6f602be22ed.zip | |
Suppress warning of DeprecationWarning: invalid escape sequence in regexp
- set strings as raw strings with r prefix
Diffstat (limited to 'src/msec/plugins/msec.py')
| -rwxr-xr-x | src/msec/plugins/msec.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/msec/plugins/msec.py b/src/msec/plugins/msec.py index 52eb8d7..5b18f62 100755 --- a/src/msec/plugins/msec.py +++ b/src/msec/plugins/msec.py @@ -70,10 +70,10 @@ SYSTEMCTL = '../bin/systemctl' # regexps # X server SECURETTY = '/etc/securetty' -STARTX_REGEXP = '(\s*serverargs=".*) -nolisten tcp(.*")' -XSERVERS_REGEXP = '(\s*[^#]+/usr/bin/X .*) -nolisten tcp(.*)' -GDMCONF_REGEXP = '(\s*command=.*/X.*?) -nolisten tcp(.*)$' -SDDMCONF_REGEXP = re.compile('(.*?)-listen tcp(.*)$') +STARTX_REGEXP = r'(\s*serverargs=".*) -nolisten tcp(.*")' +XSERVERS_REGEXP = r'(\s*[^#]+/usr/bin/X .*) -nolisten tcp(.*)' +GDMCONF_REGEXP = r'(\s*command=.*/X.*?) -nolisten tcp(.*)$' +SDDMCONF_REGEXP = re.compile(r'(.*?)-listen tcp(.*)$') # ctrl-alt-del CTRALTDEL_REGEXP = '^ca::ctrlaltdel:/sbin/shutdown.*' # ssh PermitRootLogin @@ -99,12 +99,12 @@ class msec: # associate helper commands with files self.configfiles.add_config_assoc(INITTAB, '/sbin/telinit q') - self.configfiles.add_config_assoc('/etc(?:/rc.d)?/init.d/(.+)', '[ -f /var/lock/subsys/@1 ] && @0 reload') + self.configfiles.add_config_assoc(r'/etc(?:/rc.d)?/init.d/(.+)', '[ -f /var/lock/subsys/@1 ] && @0 reload') self.configfiles.add_config_assoc(SYSCTLCONF, '/sbin/sysctl -e -p /etc/sysctl.d/51-drakx.conf') self.configfiles.add_config_assoc(SSHDCONFIG, '[ -f /var/lock/subsys/sshd ] && /etc/rc.d/init.d/sshd restart') self.configfiles.add_config_assoc(LILOCONF, '[ `/usr/sbin/detectloader` = LILO ] && /sbin/lilo') self.configfiles.add_config_assoc(JOURNALDCONF, '[ -f /var/lock/subsys/journald ] && systemctl restart journald') - self.configfiles.add_config_assoc('^/etc/issue$', '/usr/bin/killall mingetty') + self.configfiles.add_config_assoc(r'^/etc/issue$', '/usr/bin/killall mingetty') # security options config.SETTINGS['USER_UMASK'] = ("msec.set_user_umask", ['*']) |