From b805f8387ecdad2b9e8278702d5013cf33dc7f20 Mon Sep 17 00:00:00 2001 From: k3nny Date: Fri, 7 Mar 2025 22:51:20 +0100 Subject: [PATCH] Fix re.compile / re.match warnings --- 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_switch.py | 2 +- libtisbackup/backup_xcp_metadata.py | 2 +- libtisbackup/common.py | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/libtisbackup/backup_mysql.py b/libtisbackup/backup_mysql.py index cb78000..533d3c8 100644 --- a/libtisbackup/backup_mysql.py +++ b/libtisbackup/backup_mysql.py @@ -164,7 +164,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 27024f6..4db8696 100644 --- a/libtisbackup/backup_oracle.py +++ b/libtisbackup/backup_oracle.py @@ -144,7 +144,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 49b556f..6820ffa 100644 --- a/libtisbackup/backup_pgsql.py +++ b/libtisbackup/backup_pgsql.py @@ -142,7 +142,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 410ff48..208d122 100644 --- a/libtisbackup/backup_rsync.py +++ b/libtisbackup/backup_rsync.py @@ -139,8 +139,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: @@ -182,8 +182,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(",", "") m = reg_total_files.match(line) @@ -242,8 +242,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 < current: @@ -264,7 +264,7 @@ class backup_rsync(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_btrfs.py b/libtisbackup/backup_rsync_btrfs.py index e2f8c67..cc2d828 100644 --- a/libtisbackup/backup_rsync_btrfs.py +++ b/libtisbackup/backup_rsync_btrfs.py @@ -146,8 +146,8 @@ class backup_rsync_btrfs(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: @@ -187,8 +187,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(",", "") m = reg_total_files.match(line) @@ -260,8 +260,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 < current: @@ -281,7 +281,7 @@ class backup_rsync_btrfs(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_samba4.py b/libtisbackup/backup_samba4.py index f8a24f0..d1a64b6 100644 --- a/libtisbackup/backup_samba4.py +++ b/libtisbackup/backup_samba4.py @@ -143,7 +143,7 @@ class backup_samba4(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_sqlserver.py b/libtisbackup/backup_sqlserver.py index 4392229..7208c74 100644 --- a/libtisbackup/backup_sqlserver.py +++ b/libtisbackup/backup_sqlserver.py @@ -147,7 +147,7 @@ class backup_sqlserver(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}).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_switch.py b/libtisbackup/backup_switch.py index 8c0b360..b224777 100644 --- a/libtisbackup/backup_switch.py +++ b/libtisbackup/backup_switch.py @@ -206,7 +206,7 @@ class backup_switch(backup_generic): child.expect("#--") child.expect("#") child.close() - myre = re.compile("#--+") + myre = re.compile(r"#--+") config = myre.split(open(filename).read())[2] with open(filename, "w") as f: f.write(config) diff --git a/libtisbackup/backup_xcp_metadata.py b/libtisbackup/backup_xcp_metadata.py index eb3d76b..d263978 100644 --- a/libtisbackup/backup_xcp_metadata.py +++ b/libtisbackup/backup_xcp_metadata.py @@ -73,7 +73,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: diff --git a/libtisbackup/common.py b/libtisbackup/common.py index 4ee7969..6fd40f3 100644 --- a/libtisbackup/common.py +++ b/libtisbackup/common.py @@ -586,7 +586,7 @@ class backup_generic(ABC): ssh_port = 22 def __init__(self, backup_name, backup_dir, dbstat=None, dry_run=False): - if not re.match("^[A-Za-z0-9_\-\.]*$", backup_name): + if not re.match(r"^[A-Za-z0-9_\-\.]*$", backup_name): raise Exception("The backup name %s should contain only alphanumerical characters" % backup_name) self.backup_name = backup_name self.backup_dir = backup_dir