From a987e9e45d4084f30964a4cec9914ae6ed25a73c Mon Sep 17 00:00:00 2001 From: Ilia Ivanov Date: Thu, 14 May 2020 14:14:15 +0200 Subject: [PATCH 1/3] Fix ErrorsWithCodes().__class__ return value --- spacy/errors.py | 7 +++++-- spacy/tests/test_errors.py | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 spacy/tests/test_errors.py diff --git a/spacy/errors.py b/spacy/errors.py index 32ccd3df7..b97ef3a8e 100644 --- a/spacy/errors.py +++ b/spacy/errors.py @@ -7,8 +7,11 @@ def add_codes(err_cls): class ErrorsWithCodes(object): def __getattribute__(self, code): - msg = getattr(err_cls, code) - return "[{code}] {msg}".format(code=code, msg=msg) + if not code.startswith('__'): + msg = getattr(err_cls, code) + return "[{code}] {msg}".format(code=code, msg=msg) + else: + return super().__getattribute__(code) return ErrorsWithCodes() diff --git a/spacy/tests/test_errors.py b/spacy/tests/test_errors.py new file mode 100644 index 000000000..ba24f4456 --- /dev/null +++ b/spacy/tests/test_errors.py @@ -0,0 +1,13 @@ +from inspect import isclass + +from spacy.errors import add_codes + + +@add_codes +class Errors(object): + E001 = "error description" + + +def test_add_codes(): + assert Errors.E001 == "[E001] error description" + assert isclass(Errors.__class__) From 712d9d4820e902abe17b9b7a8ec5ac373b0b8e2d Mon Sep 17 00:00:00 2001 From: Ilia Ivanov Date: Thu, 14 May 2020 15:45:58 +0200 Subject: [PATCH 2/3] fixup! Fix ErrorsWithCodes().__class__ return value --- spacy/errors.py | 10 +++++----- spacy/tests/test_errors.py | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/spacy/errors.py b/spacy/errors.py index b97ef3a8e..d99c96922 100644 --- a/spacy/errors.py +++ b/spacy/errors.py @@ -5,13 +5,13 @@ from __future__ import unicode_literals def add_codes(err_cls): """Add error codes to string messages via class attribute names.""" - class ErrorsWithCodes(object): + class ErrorsWithCodes(err_cls): def __getattribute__(self, code): - if not code.startswith('__'): - msg = getattr(err_cls, code) - return "[{code}] {msg}".format(code=code, msg=msg) + msg = super().__getattribute__(code) + if code.startswith('__'): # python system attributes like __class__ + return msg else: - return super().__getattribute__(code) + return "[{code}] {msg}".format(code=code, msg=msg) return ErrorsWithCodes() diff --git a/spacy/tests/test_errors.py b/spacy/tests/test_errors.py index ba24f4456..1bd4eec7f 100644 --- a/spacy/tests/test_errors.py +++ b/spacy/tests/test_errors.py @@ -1,5 +1,7 @@ from inspect import isclass +import pytest + from spacy.errors import add_codes @@ -10,4 +12,6 @@ class Errors(object): def test_add_codes(): assert Errors.E001 == "[E001] error description" + with pytest.raises(AttributeError): + Errors.E002 assert isclass(Errors.__class__) From ee8fe37474ac9a0c092acc99ad1f13e8c4b97e2e Mon Sep 17 00:00:00 2001 From: Ilia Ivanov Date: Thu, 14 May 2020 15:59:06 +0200 Subject: [PATCH 3/3] Add ilivans' contributor agreement --- .github/contributors/ilivans.md | 106 ++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 .github/contributors/ilivans.md diff --git a/.github/contributors/ilivans.md b/.github/contributors/ilivans.md new file mode 100644 index 000000000..d471fde48 --- /dev/null +++ b/.github/contributors/ilivans.md @@ -0,0 +1,106 @@ +# spaCy contributor agreement + +This spaCy Contributor Agreement (**"SCA"**) is based on the +[Oracle Contributor Agreement](http://www.oracle.com/technetwork/oca-405177.pdf). +The SCA applies to any contribution that you make to any product or project +managed by us (the **"project"**), and sets out the intellectual property rights +you grant to us in the contributed materials. The term **"us"** shall mean +[ExplosionAI UG (haftungsbeschränkt)](https://explosion.ai/legal). The term +**"you"** shall mean the person or entity identified below. + +If you agree to be bound by these terms, fill in the information requested +below and include the filled-in version with your first pull request, under the +folder [`.github/contributors/`](/.github/contributors/). The name of the file +should be your GitHub username, with the extension `.md`. For example, the user +example_user would create the file `.github/contributors/example_user.md`. + +Read this agreement carefully before signing. These terms and conditions +constitute a binding legal agreement. + +## Contributor Agreement + +1. The term "contribution" or "contributed materials" means any source code, +object code, patch, tool, sample, graphic, specification, manual, +documentation, or any other material posted or submitted by you to the project. + +2. With respect to any worldwide copyrights, or copyright applications and +registrations, in your contribution: + + * you hereby assign to us joint ownership, and to the extent that such + assignment is or becomes invalid, ineffective or unenforceable, you hereby + grant to us a perpetual, irrevocable, non-exclusive, worldwide, no-charge, + royalty-free, unrestricted license to exercise all rights under those + copyrights. This includes, at our option, the right to sublicense these same + rights to third parties through multiple levels of sublicensees or other + licensing arrangements; + + * you agree that each of us can do all things in relation to your + contribution as if each of us were the sole owners, and if one of us makes + a derivative work of your contribution, the one who makes the derivative + work (or has it made will be the sole owner of that derivative work; + + * you agree that you will not assert any moral rights in your contribution + against us, our licensees or transferees; + + * you agree that we may register a copyright in your contribution and + exercise all ownership rights associated with it; and + + * you agree that neither of us has any duty to consult with, obtain the + consent of, pay or render an accounting to the other for any use or + distribution of your contribution. + +3. With respect to any patents you own, or that you can license without payment +to any third party, you hereby grant to us a perpetual, irrevocable, +non-exclusive, worldwide, no-charge, royalty-free license to: + + * make, have made, use, sell, offer to sell, import, and otherwise transfer + your contribution in whole or in part, alone or in combination with or + included in any product, work or materials arising out of the project to + which your contribution was submitted, and + + * at our option, to sublicense these same rights to third parties through + multiple levels of sublicensees or other licensing arrangements. + +4. Except as set out above, you keep all right, title, and interest in your +contribution. The rights that you grant to us under these terms are effective +on the date you first submitted a contribution to us, even if your submission +took place before the date you sign these terms. + +5. You covenant, represent, warrant and agree that: + + * Each contribution that you submit is and shall be an original work of + authorship and you can legally grant the rights set out in this SCA; + + * to the best of your knowledge, each contribution will not violate any + third party's copyrights, trademarks, patents, or other intellectual + property rights; and + + * each contribution shall be in compliance with U.S. export control laws and + other applicable export and import laws. You agree to notify us if you + become aware of any circumstance which would make any of the foregoing + representations inaccurate in any respect. We may publicly disclose your + participation in the project, including the fact that you have signed the SCA. + +6. This SCA is governed by the laws of the State of California and applicable +U.S. Federal law. Any choice of law rules will not apply. + +7. Please place an “x” on one of the applicable statement below. Please do NOT +mark both statements: + + * [x] I am signing on behalf of myself as an individual and no other person + or entity, including my employer, has or will have rights with respect to my + contributions. + + * [ ] I am signing on behalf of my employer or a legal entity and I have the + actual authority to contractually bind that entity. + +## Contributor Details + +| Field | Entry | +|------------------------------- | ------------------------ | +| Name | Ilia Ivanov | +| Company name (if applicable) | Chattermill | +| Title or role (if applicable) | DL Engineer | +| Date | 2020-05-14 | +| GitHub username | ilivans | +| Website (optional) | |