From 338497eb21011f6e459f1112df36a685dd703239 Mon Sep 17 00:00:00 2001 From: SeiyaGame <40237982+SeiyaGame@users.noreply.github.com> Date: Wed, 2 Apr 2025 22:39:33 +0200 Subject: [PATCH] (fix) SyntaxWarning with python 3.12 Changelog of python : - Invalid backslash escape sequences in strings now warn with SyntaxWarning instead of DeprecationWarning, making them more visible. (They will become syntax errors in the future.) --- libtisbackup/backup_mysql.py | 2 +- libtisbackup/backup_oracle.py | 2 +- libtisbackup/backup_pgsql.py | 2 +- libtisbackup/backup_rsync.py | 14 +++++++------- libtisbackup/backup_rsync_btrfs.py | 14 +++++++------- libtisbackup/backup_samba4.py | 2 +- libtisbackup/backup_sqlserver.py | 2 +- libtisbackup/backup_xcp_metadata.py | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/libtisbackup/backup_mysql.py b/libtisbackup/backup_mysql.py index 69446d0..d1bd59f 100644 --- a/libtisbackup/backup_mysql.py +++ b/libtisbackup/backup_mysql.py @@ -152,7 +152,7 @@ class backup_mysql(backup_generic): filelist = os.listdir(self.backup_dir) filelist.sort() - p = re.compile('^\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}$') + p = re.compile(r'^\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}$') for item in filelist: if p.match(item): dir_name = os.path.join(self.backup_dir,item) diff --git a/libtisbackup/backup_oracle.py b/libtisbackup/backup_oracle.py index cb76b16..3d93510 100644 --- a/libtisbackup/backup_oracle.py +++ b/libtisbackup/backup_oracle.py @@ -131,7 +131,7 @@ class backup_oracle(backup_generic): filelist = os.listdir(self.backup_dir) filelist.sort() - p = re.compile('^\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}$') + p = re.compile(r'^\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}$') for item in filelist: if p.match(item): dir_name = os.path.join(self.backup_dir,item) diff --git a/libtisbackup/backup_pgsql.py b/libtisbackup/backup_pgsql.py index 41983d3..1544130 100644 --- a/libtisbackup/backup_pgsql.py +++ b/libtisbackup/backup_pgsql.py @@ -138,7 +138,7 @@ class backup_pgsql(backup_generic): filelist = os.listdir(self.backup_dir) filelist.sort() - p = re.compile('^\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}$') + p = re.compile(r'^\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}$') for item in filelist: if p.match(item): dir_name = os.path.join(self.backup_dir,item) diff --git a/libtisbackup/backup_rsync.py b/libtisbackup/backup_rsync.py index 84a781d..9caf34c 100644 --- a/libtisbackup/backup_rsync.py +++ b/libtisbackup/backup_rsync.py @@ -128,8 +128,8 @@ class backup_rsync(backup_generic): if (not self.rsync_module and not self.private_key): raise Exception('If you don''t use SSH, you must specify a rsync module') - #rsync_re = re.compile('(?P[^:]*)::(?P[^/]*)/(?P.*)') - #ssh_re = re.compile('((?P.*)@)?(?P[^:]*):(?P/.*)') + #rsync_re = re.compile(r'(?P[^:]*)::(?P[^/]*)/(?P.*)') + #ssh_re = re.compile(r'((?P.*)@)?(?P[^:]*):(?P/.*)') # Add ssh connection params if self.rsync_module: @@ -170,8 +170,8 @@ class backup_rsync(backup_generic): log = monitor_stdout(process,ondata,self) - reg_total_files = re.compile('Number of files: (?P\d+)') - reg_transferred_files = re.compile('Number of .*files transferred: (?P\d+)') + reg_total_files = re.compile(r'Number of files: (?P\d+)') + reg_transferred_files = re.compile(r'Number of .*files transferred: (?P\d+)') for l in log.splitlines(): line = l.replace(',','').replace('.','') m = reg_total_files.match(line) @@ -225,8 +225,8 @@ class backup_rsync(backup_generic): filelist.sort() filelist.reverse() full = '' - r_full = re.compile('^\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}$') - r_partial = re.compile('^\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}.rsync$') + r_full = re.compile(r'^\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}$') + r_partial = re.compile(r'^\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}.rsync$') # we take all latest partials younger than the latest full and the latest full for item in filelist: if r_partial.match(item) and item[^:]*)::(?P[^/]*)/(?P.*)') - #ssh_re = re.compile('((?P.*)@)?(?P[^:]*):(?P/.*)') + #rsync_re = re.compile(r'(?P[^:]*)::(?P[^/]*)/(?P.*)') + #ssh_re = re.compile(r'((?P.*)@)?(?P[^:]*):(?P/.*)') # Add ssh connection params if self.rsync_module: @@ -178,8 +178,8 @@ class backup_rsync_btrfs(backup_generic): log = monitor_stdout(process,ondata,self) - reg_total_files = re.compile('Number of files: (?P\d+)') - reg_transferred_files = re.compile('Number of .*files transferred: (?P\d+)') + reg_total_files = re.compile(r'Number of files: (?P\d+)') + reg_transferred_files = re.compile(r'Number of .*files transferred: (?P\d+)') for l in log.splitlines(): line = l.replace(',','').replace('.','') m = reg_total_files.match(line) @@ -244,8 +244,8 @@ class backup_rsync_btrfs(backup_generic): filelist.sort() filelist.reverse() full = '' - r_full = re.compile('^\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}$') - r_partial = re.compile('^\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}.rsync$') + r_full = re.compile(r'^\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}$') + r_partial = re.compile(r'^\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}.rsync$') # we take all latest partials younger than the latest full and the latest full for item in filelist: if r_partial.match(item) and item\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}).bak.gz$' % self.db_name) + p = re.compile(r'^%s-(?P\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}).bak.gz$' % self.db_name) for item in filelist: sr = p.match(item) if sr: diff --git a/libtisbackup/backup_xcp_metadata.py b/libtisbackup/backup_xcp_metadata.py index da125ee..8fffde3 100644 --- a/libtisbackup/backup_xcp_metadata.py +++ b/libtisbackup/backup_xcp_metadata.py @@ -72,7 +72,7 @@ class backup_xcp_metadata(backup_generic): filelist = os.listdir(self.backup_dir) filelist.sort() - p = re.compile('^%s-(?P\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}).dump.gz$' % self.server_name) + p = re.compile(r'^%s-(?P\d{8,8}-\d{2,2}h\d{2,2}m\d{2,2}).dump.gz$' % self.server_name) for item in filelist: sr = p.match(item) if sr: