Remove redundant string property

Author: Enkidu93

machine/punctuation_analysis/quotation_mark_finder.py

@@ -36,7 +36,7 @@ def find_all_potential_quotation_marks_in_text_segment(
         self, text_segment: TextSegment
     ) -> List[QuotationMarkStringMatch]:
         quotation_matches: List[QuotationMarkStringMatch] = []
-        for quotation_mark_match in self._QUOTATION_MARK_PATTERN.finditer(text_segment.text.string):
+        for quotation_mark_match in self._QUOTATION_MARK_PATTERN.finditer(str(text_segment.text)):
             if self._quote_conventions.is_valid_opening_quotation_mark(
                 quotation_mark_match.group()
             ) or self._quote_conventions.is_valid_closing_quotation_mark(quotation_mark_match.group()):

machine/punctuation_analysis/quotation_mark_string_match.py

@@ -35,7 +35,7 @@ def __eq__(self, value):
 
     @property
     def quotation_mark(self) -> str:
-        return self._text_segment.text[self._start_index : self._end_index].string
+        return str(self._text_segment.text[self._start_index : self._end_index])
 
     def is_valid_opening_quotation_mark(self, quote_conventions: QuoteConventionSet) -> bool:
         return quote_conventions.is_valid_opening_quotation_mark(self.quotation_mark)
@@ -59,18 +59,18 @@ def previous_character(self) -> Optional[str]:
             if previous_segment is not None and not self._text_segment.marker_is_in_preceding_context(
                 UsfmMarkerType.PARAGRAPH
             ):
-                return previous_segment.text[-1].string
+                return str(previous_segment.text[-1])
             return None
-        return self._text_segment.text[self._start_index - 1].string
+        return str(self._text_segment.text[self._start_index - 1])
 
     @property
     def next_character(self) -> Optional[str]:
         if self.is_at_end_of_segment():
             next_segment = self._text_segment.next_segment
             if next_segment is not None and not next_segment.marker_is_in_preceding_context(UsfmMarkerType.PARAGRAPH):
-                return next_segment.text[0].string
+                return str(next_segment.text[0])
             return None
-        return self._text_segment.text[self._end_index].string
+        return str(self._text_segment.text[self._end_index])
 
     def leading_substring_matches(self, regex_pattern: regex.Pattern) -> bool:
         return regex_pattern.search(self._text_segment.substring_before(self._start_index)) is not None
@@ -100,9 +100,9 @@ def end_index(self) -> int:
     # Not used, but a useful method for debugging
     @property
     def context(self) -> str:
-        return self._text_segment.text[
+        return str(self._text_segment.text[
             max(self._start_index - 10, 0) : min(self._end_index + 10, len(self._text_segment.text))
-        ].string
+        ])
 
     def resolve(self, depth: int, direction: QuotationMarkDirection) -> QuotationMarkMetadata:
         return QuotationMarkMetadata(

machine/punctuation_analysis/text_segment.py

@@ -40,10 +40,10 @@ def length(self) -> int:
         return len(self._text)
 
     def substring_before(self, index: int) -> str:
-        return self._text[:index].string
+        return str(self._text[:index])
 
     def substring_after(self, index: int) -> str:
-        return self._text[index:].string
+        return str(self._text[index:])
 
     def marker_is_in_preceding_context(self, marker: UsfmMarkerType) -> bool:
         return marker in self._markers_in_preceding_context
@@ -57,7 +57,7 @@ def is_last_segment_in_verse(self) -> bool:
     def replace_substring(self, start_index: int, end_index: int, replacement: str) -> None:
         self._text = GraphemeString(self.substring_before(start_index) + replacement + self.substring_after(end_index))
         if self._usfm_token is not None:
-            self._usfm_token.text = self._text.string
+            self._usfm_token.text = str(self._text)
 
     class Builder:
         def __init__(self):
@@ -97,17 +97,13 @@ def __init__(self, string: str) -> None:
     def __len__(self) -> int:
         return len(self._string_index_by_grapheme_index)
 
-    @property
-    def string(self) -> str:
-        return self._string
-
     def __str__(self):
         return self._string
 
     def __eq__(self, other) -> bool:
         if not isinstance(other, GraphemeString):
             return False
-        return self._string == other.string
+        return self._string == other._string
 
     def __getitem__(self, key) -> "GraphemeString":
         if isinstance(key, int):