Yann Leboulanger pushed to branch master at gajim / gajim

Commits:

3 changed files:

Changes:

  • src/common/helpers.py
    ... ... @@ -459,7 +459,7 @@ def get_output_of_command(command):
    459 459
         return output
    
    460 460
     
    
    461 461
     def get_windows_reg_env(varname, default=''):
    
    462
    -    """
    
    462
    +    r"""
    
    463 463
         Ask for paths commonly used but not exposed as ENVs in english Windows 2003
    
    464 464
         those are:
    
    465 465
                 'AppData' = %USERPROFILE%\Application Data (also an ENV)
    

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

  • src/plugins/pluginmanager.py
    ... ... @@ -404,7 +404,7 @@ class PluginManager(metaclass=Singleton):
    404 404
         @staticmethod
    
    405 405
         @log_calls('PluginManager')
    
    406 406
         def scan_dir_for_plugins(path, scan_dirs=True):
    
    407
    -        '''
    
    407
    +        r'''
    
    408 408
             Scans given directory for plugin classes.
    
    409 409
     
    
    410 410
             :param path: directory to scan for plugins