Merge pull request ppannuto#28 from Garrett-R/master

ppannuto · web-flow · commit ff440439a9db · 2017-07-14T09:57:50.000-04:00
More robust against unicode chars
diff --git a/titlecase/__init__.py b/titlecase/__init__.py
@@ -25,7 +25,6 @@
 SMALL_LAST = re.compile(r'\b(%s)[%s]?$' % (SMALL, PUNCT), re.I)
 SUBPHRASE = re.compile(r'([:.;?!\-–‒—―][ ])(%s)' % SMALL)
 APOS_SECOND = re.compile(r"^[dol]{1}['‘]{1}[a-z]+(?:['s]{2})?$", re.I)
-ALL_CAPS = re.compile(r'^[A-Z\s\d%s]+$' % PUNCT)
 UC_INITIALS = re.compile(r"^(?:[A-Z]{1}\.{1}|[A-Z]{1}\.{1}[A-Z]{1})+$")
 MAC_MC = re.compile(r"^([Mm]c|MC)(\w.+)")
 
@@ -64,7 +63,7 @@ def titlecase(text, callback=None, small_first_last=True):
     lines = re.split('[\r\n]+', text)
     processed = []
     for line in lines:
-        all_caps = ALL_CAPS.match(line)
+        all_caps = line.upper() == line
         words = re.split('[\t ]', line)
         tc_line = []
         for word in words:
diff --git a/titlecase/tests.py b/titlecase/tests.py
@@ -124,6 +124,14 @@
         "episode 7 – The force awakens",
         "Episode 7 – The Force Awakens"
     ),
+    (
+        "THE CASE OF X ≤ 7",
+        "The Case of X ≤ 7"
+    ),
+    (
+        "the case of X ≤ 7",
+        "The Case of X ≤ 7"
+    ),
     (
         '"Nothing to Be Afraid of?"',
         '"Nothing to Be Afraid Of?"'
@@ -247,12 +255,6 @@
 )
 
 
-def test_all_caps_regex():
-    """Test - all capitals regex"""
-    from titlecase import ALL_CAPS
-    assert bool(ALL_CAPS.match('THIS IS ALL CAPS')) is True
-
-
 def test_initials_regex():
     """Test - uppercase initials regex with A.B"""
     from titlecase import UC_INITIALS
