Improved format directives regex

netromdk · Jan 12, 2020 · 0ac202f · 0ac202f
1 parent 5e837ab
commit 0ac202f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/tests/general.py b/tests/general.py
@@ -37,9 +37,9 @@ def test_format(self):
 
   def test_strftime_directives(self):
     visitor = visit("from datetime import datetime\ndatetime.now().strftime('%A %d. %B %Y')")
-    self.assertOnlyIn(("%A", "%d", "%B", "%Y"), visitor.strftime_directives())
+    self.assertOnlyIn(("A", "d", "B", "Y"), visitor.strftime_directives())
     visitor = visit("from datetime import datetime\ndatetime.strptime('2018', '%Y')")
-    self.assertOnlyIn("%Y", visitor.strftime_directives())
+    self.assertOnlyIn("Y", visitor.strftime_directives())
 
   def test_modules(self):
     visitor = visit("import ast\nimport sys, argparse\nfrom os import *")

diff --git a/vermin/rules.py b/vermin/rules.py
@@ -2930,10 +2930,11 @@ def MOD_MEM_REQS():
 
 # datetime+time strftime/strptime requirements: directive -> requirements
 STRFTIME_REQS = {
-  "%G": (None, (3, 6)),
-  "%V": (None, (3, 6)),
-  "%f": ((2, 6), (3, 0)),
-  "%u": (None, (3, 6)),
+  "G": (None, (3, 6)),
+  "V": (None, (3, 6)),
+  "f": ((2, 6), (3, 0)),
+  "u": (None, (3, 6)),
+}
 }
 
 # array.array typecode requirements: typecode -> requirements

diff --git a/vermin/source_visitor.py b/vermin/source_visitor.py
@@ -7,7 +7,7 @@
 from .config import Config
 from .utility import dotted_name, reverse_range, combine_versions, version_strings
 
-STRFTIME_DIRECTIVE_REGEX = re.compile(r"(%\w)")
+STRFTIME_DIRECTIVE_REGEX = re.compile(r"%(?:[-\.\d#\s\+])*(\w)")
 
 class SourceVisitor(ast.NodeVisitor):
   def __init__(self, config=None):