Improve regex for ignoring locales when looking for datetime formats.

gleeda · Jun 17, 2015 · 25963e3 · 25963e3
1 parent 0f567f0
commit 25963e3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/openpyxl/styles/numbers.py b/openpyxl/styles/numbers.py
@@ -161,12 +161,13 @@ def is_date_format(self):
 
 
 DATE_INDICATORS = 'dmyhs'
-BAD_DATE_RE = re.compile(r'(\[|").*[dmhys].*(\]|")')
+BAD_DATE_RE = re.compile(r'((?<=\[\$)|").*[dmhys]+.*(\]|")', re.UNICODE)
 
 def is_date_format(fmt):
     if fmt is None:
         return False
-    if any([x in fmt.lower() for x in DATE_INDICATORS]):
+    fmt = fmt.lower()
+    if any([x in fmt for x in DATE_INDICATORS]):
         return not BAD_DATE_RE.search(fmt)
     return False
 

diff --git a/openpyxl/styles/tests/test_number_style.py b/openpyxl/styles/tests/test_number_style.py
@@ -29,9 +29,25 @@ def __init__(self, value=None):
 @pytest.mark.parametrize("format, result",
                          [
                              ("DD/MM/YY", True),
-                             ("H:MM:SS;@", True)
+                             ("H:MM:SS;@", True),
+                             ("H:MM:SS;@", True),
+                             (u'#,##0\\ [$\u20bd-46D]', False)
                          ]
                          )
 def test_is_date_format(format, result):
     from ..numbers import is_date_format
     assert is_date_format(format) is result
+
+
+@pytest.mark.parametrize("fmt, result",
+                         [
+                             ("[h]:mm:ss", False),
+                             ("[hh]:mm:ss", False),
+                             (u'#,##0\\ [$\u20bd-46D]', True),
+                             ('"$"#,##0_);[Red]("$"#,##0)', True)
+                         ]
+                         )
+def test_datetime_regex(fmt, result):
+    from ..numbers import BAD_DATE_RE
+    match = BAD_DATE_RE.search(fmt.lower()) is not None
+    assert match is result