Achieve 100% statement and branch test coverage

Author: ambv

Lib/_py_grapheme.py

@@ -67,10 +67,8 @@ def __repr__(self):
 def _get_gcb(cp):
     """Return the Grapheme_Cluster_Break value for a codepoint."""
     idx = bisect_right(_GCB_STARTS, cp) - 1
-    if idx >= 0:
-        entry = GCB_RANGES[idx]
-        if cp <= entry[1]:
-            return entry[2]
+    if idx >= 0 and cp <= GCB_RANGES[idx][1]:
+        return GCB_RANGES[idx][2]
     # Hangul syllables: LV if (cp - S_BASE) % T_COUNT == 0, else LVT
     if _HANGUL_S_BASE <= cp < _HANGUL_S_BASE + _HANGUL_S_COUNT:
         if (cp - _HANGUL_S_BASE) % _HANGUL_T_COUNT == 0:

Lib/test/test_unicodedata.py

@@ -1182,17 +1182,6 @@ def test_linebreak_7643(self):
                 self.assertEqual(len(lines), 1,
                                  r"%a should not be a linebreak" % c)
 
-    def test_segment_object(self):
-        segments = list(unicodedata.iter_graphemes('spa\u0300m'))
-        self.assertEqual(len(segments), 4, segments)
-        segment = segments[2]
-        self.assertEqual(segment.start, 2)
-        self.assertEqual(segment.end, 4)
-        self.assertEqual(str(segment), 'a\u0300')
-        self.assertEqual(repr(segment), '<Segment 2:4>')
-        self.assertRaises(TypeError, iter, segment)
-        self.assertRaises(TypeError, len, segment)
-
 
 class NormalizationTest(unittest.TestCase):
     @staticmethod
@@ -1384,6 +1373,18 @@ def test_segment_object(self):
         self.assertEqual(segment.start, 2)
         self.assertEqual(segment.end, 4)
         self.assertEqual(str(segment), 'a\u0300')
+        self.assertEqual(repr(segment), '<Segment 2:4>')
+        self.assertRaises(TypeError, iter, segment)
+        self.assertRaises(TypeError, len, segment)
+
+    def test_grapheme_break_fsm_edges(self):
+        graphemes = self._graphemes
+        # ExtPict followed by non-Extend/non-ZWJ resets the EP FSM
+        self.assertEqual(graphemes('\u2764b'), ['\u2764', 'b'])
+        # Consonant followed by InCB Extend (not Linker) stays in Started
+        self.assertEqual(graphemes('\u0915\u0951'), ['\u0915\u0951'])
+        # Consonant followed by InCB None resets InCB FSM
+        self.assertEqual(graphemes('\u0915b'), ['\u0915', 'b'])
 
     def _graphemes(self, *args):
         return list(map(str, self.iter_graphemes(*args)))