unicodedata-reader 1.3.3__tar.gz → 1.3.4__tar.gz

{unicodedata_reader-1.3.3 → unicodedata_reader-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unicodedata-reader
-Version: 1.3.3
+Version: 1.3.4
 Summary: 
 Home-page: https://github.com/kojiishi/unicodedata-reader
 License: Apache-2.0

{unicodedata_reader-1.3.3 → unicodedata_reader-1.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "unicodedata-reader"
-version = "1.3.3"
+version = "1.3.4"
 description = ""
 authors = ["Koji Ishii <kojii@chromium.org>"]
 readme = "README.md"

{unicodedata_reader-1.3.3 → unicodedata_reader-1.3.4}/unicodedata_reader/entry.py

@@ -16,7 +16,7 @@ from typing import Tuple
 _logger = logging.getLogger('UnicodeDataEntry')
 
 
-def u_hex(value):
+def u_hex(value: int) -> str:
     return f'{value:04X}'
 
 
@@ -79,16 +79,24 @@ class UnicodeDataEntry(object):
     def is_in_range(self, code: int) -> bool:
         return code >= self.min and code <= self.max
 
+    @staticmethod
+    def to_codes(entries: Iterable['UnicodeDataEntry']):
+        return itertools.chain(*(e.range() for e in entries))
+
     @property
     def count(self):
         self.assert_range()
         return self.max - self.min + 1
 
-    def range_as_str(self):
+    def range_as_str(self, converter: Callable[[int], str] = u_hex):
         self.assert_range()
+        min = converter(self.min)
         if self.min == self.max:
-            return u_hex(self.min)
-        return f'{u_hex(self.min)}..{u_hex(self.max)}'
+            return min
+        max = converter(self.max)
+        if min == max:
+            return min
+        return f'{min}..{max}'
 
     def to_str(self, separator: str = ';'):
         return separator.join((self.range_as_str(), str(self.value)))
@@ -268,18 +276,14 @@ class UnicodeDataEntries(object):
         """Returns an `Iterable` of `UnicodeDataEntry` for the given `pred`."""
         return (entry for entry in self if pred(entry.value))
 
-    def codes_for(self, pred: Callable[[Any], bool]) -> Iterable[int]:
-        """Returns an `Iterable` of Unicode code points for the given `pred`."""
-        return itertools.chain(*(e.range() for e in self.filter(pred)))
-
     def add_to_set(self, pred: Callable[[Any], bool], set: set) -> None:
         """Add values `pred` returns `True` to `set[int]`."""
-        for code in self.codes_for(pred):
+        for code in UnicodeDataEntry.to_codes(self.filter(pred)):
             set.add(code)
 
     def remove_from_set(self, pred: Callable[[Any], bool], set: set) -> None:
         """Remove values `pred` returns `True` from `set[int]`."""
-        for code in self.codes_for(pred):
+        for code in UnicodeDataEntry.to_codes(self.filter(pred)):
             set.discard(code)
 
     def to_set(self, pred: Callable[[Any], bool]) -> set: