From 419edfab50c05e06461c3db51fe8333fc92b2941 Mon Sep 17 00:00:00 2001 From: Matthew Honnibal Date: Thu, 4 Feb 2016 15:50:17 +0100 Subject: [PATCH] * Use generic flags for the new attributes until they're added --- spacy/language.py | 8 ++++---- spacy/lexeme.pyx | 5 ++++- spacy/tokens/token.pyx | 5 ++++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/spacy/language.py b/spacy/language.py index 964cbd8ce..9b7b21378 100644 --- a/spacy/language.py +++ b/spacy/language.py @@ -137,10 +137,10 @@ class Language(object): attrs.IS_SPACE: cls.is_space, attrs.IS_TITLE: cls.is_title, attrs.IS_UPPER: cls.is_upper, - attrs.IS_BRACKET: cls.is_bracket, - attrs.IS_QUOTE: cls.is_quote, - attrs.IS_LEFT_PUNCT: cls.is_left_punct, - attrs.IS_RIGHT_PUNCT: cls.is_right_punct, + attrs.FLAG14: cls.is_bracket, + attrs.FLAG15: cls.is_quote, + attrs.FLAG16: cls.is_left_punct, + attrs.FLAG17: cls.is_right_punct, attrs.LIKE_URL: cls.like_url, attrs.LIKE_NUM: cls.like_num, attrs.LIKE_EMAIL: cls.like_email, diff --git a/spacy/lexeme.pyx b/spacy/lexeme.pyx index 9a2ffe9a1..1aec4a018 100644 --- a/spacy/lexeme.pyx +++ b/spacy/lexeme.pyx @@ -18,7 +18,10 @@ import numpy from .attrs cimport IS_ALPHA, IS_ASCII, IS_DIGIT, IS_LOWER, IS_PUNCT, IS_SPACE from .attrs cimport IS_TITLE, IS_UPPER, LIKE_URL, LIKE_NUM, LIKE_EMAIL, IS_STOP -from .attrs cimport IS_BRACKET, IS_QUOTE, IS_LEFT_PUNCT, IS_RIGHT_PUNCT +from .attrs cimport FLAG14 as IS_BRACKET +from .attrs cimport FLAG15 as IS_QUOTE +from .attrs cimport FLAG16 as IS_LEFT_PUNCT +from .attrs cimport FLAG17 as IS_RIGHT_PUNCT from .attrs cimport IS_OOV diff --git a/spacy/tokens/token.pyx b/spacy/tokens/token.pyx index 9334fb466..342bcf409 100644 --- a/spacy/tokens/token.pyx +++ b/spacy/tokens/token.pyx @@ -18,7 +18,10 @@ from ..attrs cimport POS, LEMMA, TAG, DEP from ..parts_of_speech cimport CONJ, PUNCT from ..attrs cimport IS_ALPHA, IS_ASCII, IS_DIGIT, IS_LOWER, IS_PUNCT, IS_SPACE -from ..attrs cimport IS_BRACKET, IS_QUOTE, IS_LEFT_PUNCT, IS_RIGHT_PUNCT +from ..attrs cimport FLAG14 as IS_BRACKET +from ..attrs cimport FLAG15 as IS_QUOTE +from ..attrs cimport FLAG16 as IS_LEFT_PUNCT +from ..attrs cimport FLAG17 as IS_RIGHT_PUNCT from ..attrs cimport IS_TITLE, IS_UPPER, LIKE_URL, LIKE_NUM, LIKE_EMAIL, IS_STOP from ..attrs cimport IS_OOV