From 25dda29fb5bb662d7fbe39457a1f85e94ad7079c Mon Sep 17 00:00:00 2001 From: Norwid Behrnd Date: Thu, 25 Nov 2021 11:01:08 +0100 Subject: [PATCH] Simplify scope of regex As long as years as written with integers of four decimals, \d{4,4} may be substituted by \d{4}, too. --- date2name/__init__.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/date2name/__init__.py b/date2name/__init__.py index dbe29ba..6641958 100755 --- a/date2name/__init__.py +++ b/date2name/__init__.py @@ -31,13 +31,13 @@ FORMATSTRING_MONTH = "%Y-%m" FORMATSTRING_WITHTIME = "%Y-%m-%dT%H.%M.%S" REGEX_PATTERNS = { 'NODATESTAMP': re.compile('^\D'), - 'SHORT': re.compile('^(\d{2,2})([01]\d)([0123]\d)([- _])'), - 'COMPACT': re.compile('^(\d{4,4})([01]\d)([0123]\d)([- _])'), - 'STANDARD': re.compile('^(\d{4,4})-([01]\d)-([0123]\d)([- _])'), - 'MONTH': re.compile('^(\d{4,4})-([01]\d)(?!-[0123]\d)([- _])'), - 'WITHTIME_AND_SECONDS': re.compile('^(\d{4,4})-([01]\d)-([0123]\d)([T :_-])([012]\d)([:.-])([012345]\d)([:.-])([012345]\d)([- _.])'), - 'WITHTIME_NO_SECONDS': re.compile('^(\d{4,4})-([01]\d)-([0123]\d)([T :_-])([012]\d)([:.-])([012345]\d)([- _.])'), - 'WITHSECONDS': re.compile('^(\d{4,4})-([01]\d)-([0123]\d)([T :_-])([012]\d)([:.-])([012345]\d)([:.-])([012345]\d)([- _])'), + 'SHORT': re.compile('^(\d{2})([01]\d)([0123]\d)([- _])'), + 'COMPACT': re.compile('^(\d{4})([01]\d)([0123]\d)([- _])'), + 'STANDARD': re.compile('^(\d{4})-([01]\d)-([0123]\d)([- _])'), + 'MONTH': re.compile('^(\d{4})-([01]\d)(?!-[0123]\d)([- _])'), + 'WITHTIME_AND_SECONDS': re.compile('^(\d{4})-([01]\d)-([0123]\d)([T :_-])([012]\d)([:.-])([012345]\d)([:.-])([012345]\d)([- _.])'), + 'WITHTIME_NO_SECONDS': re.compile('^(\d{4})-([01]\d)-([0123]\d)([T :_-])([012]\d)([:.-])([012345]\d)([- _.])'), + 'WITHSECONDS': re.compile('^(\d{4})-([01]\d)-([0123]\d)([T :_-])([012]\d)([:.-])([012345]\d)([:.-])([012345]\d)([- _])'), } MAX_PATHLENGTH = 255 # os.pathconf('/', 'PC_PATH_MAX') may be longer but os.rename() seems to have hard-coded 256 @@ -99,7 +99,7 @@ parser.add_option("--delimiter", dest="delimiter", metavar='DELIMITER_STRING', 'space, or underscore may result in not recognizing the delimiter ' + 'for further operations such as fixing slightly wrong formatted time-stamps.') parser.add_option("--nocorrections", dest="nocorrections", action="store_true", - help="do not convert existing but slightely wrong formatted date/time-stamps to new format") + help="do not convert existing but slightly wrong formatted date/time-stamps to new format") parser.add_option("-q", "--quiet", dest="quiet", action="store_true", help="do not output anything but just errors on console") parser.add_option("-v", "--verbose", dest="verbose", action="store_true",