From 9cbf186ff87a880d227ad04dfeaa39ed70c23359 Mon Sep 17 00:00:00 2001 From: sashacmc Date: Wed, 22 May 2024 23:38:21 +0200 Subject: [PATCH] Fix regexp definition and test --- photo_importer/fileprop.py | 16 ++++++++-------- photo_importer/importer_test.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/photo_importer/fileprop.py b/photo_importer/fileprop.py index 7fb3352..cfa6f4d 100755 --- a/photo_importer/fileprop.py +++ b/photo_importer/fileprop.py @@ -19,28 +19,28 @@ GARBAGE = 4 class FileProp(object): DATE_REGEX = [ ( - re.compile('\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}'), + re.compile(r'\d{4}-\d{2}-\d{2}_\d{2}-\d{2}-\d{2}'), '%Y-%m-%d_%H-%M-%S', ), ( - re.compile('\d{4}-\d{2}-\d{2}-\d{2}-\d{2}-\d{2}'), + re.compile(r'\d{4}-\d{2}-\d{2}-\d{2}-\d{2}-\d{2}'), '%Y-%m-%d-%H-%M-%S', ), ( - re.compile('\d{4}-\d{2}-\d{2}T\d{2}.\d{2}.\d{2}'), + re.compile(r'\d{4}-\d{2}-\d{2}T\d{2}.\d{2}.\d{2}'), '%Y-%m-%dT%H.%M.%S', ), ( - re.compile('\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}'), + re.compile(r'\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}'), '%Y-%m-%dT%H:%M:%S', ), ( - re.compile('\d{4}_\d{2}_\d{2}_\d{2}_\d{2}_\d{2}'), + re.compile(r'\d{4}_\d{2}_\d{2}_\d{2}_\d{2}_\d{2}'), '%Y_%m_%d_%H_%M_%S', ), - (re.compile('\d{8}_\d{6}'), '%Y%m%d_%H%M%S'), - (re.compile('\d{14}'), '%Y%m%d%H%M%S'), - (re.compile('\d{8}'), '%Y%m%d'), + (re.compile(r'\d{8}_\d{6}'), '%Y%m%d_%H%M%S'), + (re.compile(r'\d{14}'), '%Y%m%d%H%M%S'), + (re.compile(r'\d{8}'), '%Y%m%d'), ] SPACE_REGEX = re.compile(r'\s+') diff --git a/photo_importer/importer_test.py b/photo_importer/importer_test.py index 31346e3..9bd0027 100755 --- a/photo_importer/importer_test.py +++ b/photo_importer/importer_test.py @@ -62,6 +62,6 @@ class TestImporter(unittest.TestCase): self.assertEqual( files[1], os.path.join( - tmpdirname, 'Foto/2022/2022-11-21/2022-11-21_00-42-07.JPG' + tmpdirname, 'Foto/2022/2022-11-21/2022-11-21_00-42-07.jpg' ), )