From 0e2498da00349e16fe4e74c303172a24da698590 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Tue, 29 Dec 2015 16:56:51 +0100 Subject: [PATCH] * Replace from_package with load() classmethod in Vocab --- spacy/vocab.pyx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spacy/vocab.pyx b/spacy/vocab.pyx index bb0ae6173..ab0a522b1 100644 --- a/spacy/vocab.pyx +++ b/spacy/vocab.pyx @@ -19,6 +19,7 @@ from .orth cimport word_shape from .typedefs cimport attr_t from .cfile cimport CFile from .lemmatizer import Lemmatizer +from .util import MockPackage from . import attrs from . import symbols @@ -47,11 +48,12 @@ cdef class Vocab: '''A map container for a language's LexemeC structs. ''' @classmethod - def from_package(cls, package, get_lex_attr=None): + def load(cls, pkg_or_str_or_file, get_lex_attr=None): + package = MockPackage.create_or_return(pkg_or_str_or_file) tag_map = package.load_utf8(json.load, 'vocab', 'tag_map.json') - lemmatizer = Lemmatizer.from_package(package) + lemmatizer = Lemmatizer.load(package) serializer_freqs = package.load_utf8(json.load, 'vocab', 'serializer.json', @@ -67,7 +69,6 @@ cdef class Vocab: if package.has_file('vocab', 'vec.bin'): # TODO: really optional? self.vectors_length = self.load_vectors_from_bin_loc( package.file_path('vocab', 'vec.bin')) - return self def __init__(self, get_lex_attr=None, tag_map=None, lemmatizer=None, serializer_freqs=None):