Make sure strings don’t contain unescaped backslashes.

This commit is contained in:
Emmanuel Gil Peyrot 2017-01-01 21:48:44 +00:00
parent 4bc6f19f19
commit 03446bb74f
3 changed files with 4 additions and 4 deletions

View File

@ -459,7 +459,7 @@ def get_output_of_command(command):
return output return output
def get_windows_reg_env(varname, default=''): def get_windows_reg_env(varname, default=''):
""" r"""
Ask for paths commonly used but not exposed as ENVs in english Windows 2003 Ask for paths commonly used but not exposed as ENVs in english Windows 2003
those are: those are:
'AppData' = %USERPROFILE%\Application Data (also an ENV) 'AppData' = %USERPROFILE%\Application Data (also an ENV)

View File

@ -1943,9 +1943,9 @@ class Interface:
# We match from our list of emoticons, but they must either have # We match from our list of emoticons, but they must either have
# whitespace, or another emoticon next to it to match successfully # whitespace, or another emoticon next to it to match successfully
# [\w.] alphanumeric and dot (for not matching 8) in (2.8)) # [\w.] alphanumeric and dot (for not matching 8) in (2.8))
emoticons_pattern = '|' + '(?:(?<![\w.]' + \ emoticons_pattern = '|' + r'(?:(?<![\w.]' + \
emoticons_pattern_prematch[:-1] + '))' + '(?:' + \ emoticons_pattern_prematch[:-1] + '))' + '(?:' + \
emoticons_pattern[:-1] + ')' + '(?:(?![\w]' + \ emoticons_pattern[:-1] + ')' + r'(?:(?![\w]' + \
emoticons_pattern_postmatch[:-1] + '))' emoticons_pattern_postmatch[:-1] + '))'
# because emoticons match later (in the string) they need to be after # because emoticons match later (in the string) they need to be after

View File

@ -404,7 +404,7 @@ class PluginManager(metaclass=Singleton):
@staticmethod @staticmethod
@log_calls('PluginManager') @log_calls('PluginManager')
def scan_dir_for_plugins(path, scan_dirs=True): def scan_dir_for_plugins(path, scan_dirs=True):
''' r'''
Scans given directory for plugin classes. Scans given directory for plugin classes.
:param path: directory to scan for plugins :param path: directory to scan for plugins