Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions pyuca/collator.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
import re
import sys
import unicodedata
import importlib.abc
import importlib.resources
from io import open
import pathlib

from .trie import Trie
from .utils import hexstrings2int
Expand Down Expand Up @@ -39,15 +42,15 @@ class BaseCollator(object):

def __init__(self, filename=None):
if filename is None:
filename = os.path.join(
os.path.dirname(__file__),
"allkeys-{0}.txt".format(self.UCA_VERSION))
filename = importlib.resources.files(__package__).joinpath("allkeys-{0}.txt".format(self.UCA_VERSION))
elif isinstance(filename, str):
filename = pathlib.Path(filename)
self.table = Trie()
self.implicit_weights = []
self.load(filename)

def load(self, filename):
with open(filename) as keys_file:
with filename.open() as keys_file:
for line in keys_file:
line = line.split("#", 1)[0].rstrip()

Expand Down