Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ran black

Browse source
This commit is contained in:
InspectorCaracal 2022-11-17 19:36:07 -07:00
parent 344c2dfc3b
commit c0fdd5a5db
2 changed files with 60 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

230
evennia/utils/verb_conjugation/pronouns.py
View file

@ -59,10 +59,7 @@ PRONOUN_MAPPING = {
"neutral": "mine", "neutral": "mine",
"plural": "ours", "plural": "ours",
}, },
"reflexive pronoun": { "reflexive pronoun": {"neutral": "myself", "plural": "ourselves"},
"neutral": "myself",
"plural": "ourselves"
}
}, },
"2nd person": { "2nd person": {
"subject pronoun": { "subject pronoun": {
@ -80,26 +77,16 @@ PRONOUN_MAPPING = {
"reflexive pronoun": { "reflexive pronoun": {
"neutral": "yourself", "neutral": "yourself",
"plural": "yourselves", "plural": "yourselves",
} },
}, },
"3rd person": { "3rd person": {
"subject pronoun": { "subject pronoun": {"male": "he", "female": "she", "neutral": "it", "plural": "they"},
"male": "he", "object pronoun": {"male": "him", "female": "her", "neutral": "it", "plural": "them"},
"female": "she",
"neutral": "it",
"plural": "they"
},
"object pronoun": {
"male": "him",
"female": "her",
"neutral": "it",
"plural": "them"
},
"possessive adjective": { "possessive adjective": {
"male": "his", "male": "his",
"female": "her", "female": "her",
"neutral": "its", "neutral": "its",
"plural": "their" "plural": "their",
}, },
"possessive pronoun": { "possessive pronoun": {
"male": "his", "male": "his",
@ -113,166 +100,61 @@ PRONOUN_MAPPING = {
"neutral": "itself", "neutral": "itself",
"plural": "themselves", "plural": "themselves",
}, },
} },
} }
PRONOUN_TABLE = { PRONOUN_TABLE = {
"I": ( "I": ("1st person", ("neutral", "male", "female", "plural"), "subject pronoun"),
"1st person", "me": ("1st person", ("neutral", "male", "female", "plural"), "object pronoun"),
("neutral", "male", "female", "plural"), "my": ("1st person", ("neutral", "male", "female", "plural"), "possessive adjective"),
"subject pronoun" "mine": ("1st person", ("neutral", "male", "female", "plural"), "possessive pronoun"),
), "myself": ("1st person", ("neutral", "male", "female", "plural"), "reflexive pronoun"),
"me": ( "we": ("1st person", "plural", "subject pronoun"),
"1st person", "us": ("1st person", "plural", "object pronoun"),
("neutral", "male", "female", "plural"), "our": ("1st person", "plural", "possessive adjective"),
"object pronoun" "ours": ("1st person", "plural", "possessive pronoun"),
), "ourselves": ("1st person", "plural", "reflexive pronoun"),
"my": (
"1st person",
("neutral", "male", "female", "plural"),
"possessive adjective"
),
"mine": (
"1st person",
("neutral", "male", "female", "plural"),
"possessive pronoun"
),
"myself": (
"1st person",
("neutral", "male", "female", "plural"),
"reflexive pronoun"
),
"we": (
"1st person",
"plural",
"subject pronoun"
),
"us": (
"1st person",
"plural",
"object pronoun"
),
"our": (
"1st person",
"plural",
"possessive adjective"
),
"ours": (
"1st person",
"plural",
"possessive pronoun"
),
"ourselves": (
"1st person",
"plural",
"reflexive pronoun"
),
"you": ( "you": (
"2nd person", "2nd person",
("neutral", "male", "female", "plural"), ("neutral", "male", "female", "plural"),
("subject pronoun", "object pronoun") ("subject pronoun", "object pronoun"),
), ),
"your": ( "your": ("2nd person", ("neutral", "male", "female", "plural"), "possessive adjective"),
"2nd person", "yours": ("2nd person", ("neutral", "male", "female", "plural"), "possessive pronoun"),
("neutral", "male", "female", "plural"), "yourself": ("2nd person", ("neutral", "male", "female"), "reflexive pronoun"),
"possessive adjective" "yourselves": ("2nd person", "plural", "reflexive pronoun"),
), "he": ("3rd person", "male", "subject pronoun"),
"yours": ( "him": ("3rd person", "male", "object pronoun"),
"2nd person", "his": (
("neutral", "male", "female", "plural"), "3rd person",
"possessive pronoun" "male",
), ("possessive pronoun", "possessive adjective"),
"yourself": ( ),
"2nd person", "himself": ("3rd person", "male", "reflexive pronoun"),
("neutral", "male", "female"), "she": ("3rd person", "female", "subject pronoun"),
"reflexive pronoun"
),
"yourselves": (
"2nd person",
"plural",
"reflexive pronoun"
),
"he": (
"3rd person",
"male",
"subject pronoun"
),
"him": (
"3rd person",
"male",
"object pronoun"
),
"his":(
"3rd person",
"male",
("possessive pronoun","possessive adjective"),
),
"himself": (
"3rd person",
"male",
"reflexive pronoun"
),
"she": (
"3rd person",
"female",
"subject pronoun"
),
"her": ( "her": (
"3rd person", "3rd person",
"female", "female",
("object pronoun", "possessive adjective"), ("object pronoun", "possessive adjective"),
), ),
"hers": ( "hers": ("3rd person", "female", "possessive pronoun"),
"3rd person", "herself": ("3rd person", "female", "reflexive pronoun"),
"female",
"possessive pronoun"
),
"herself": (
"3rd person",
"female",
"reflexive pronoun"
),
"it": ( "it": (
"3rd person", "3rd person",
"neutral", "neutral",
("subject pronoun", "object pronoun"), ("subject pronoun", "object pronoun"),
), ),
"its": ( "its": (
"3rd person", "3rd person",
"neutral", "neutral",
("possessive pronoun", "possessive adjective"), ("possessive pronoun", "possessive adjective"),
), ),
"itself": ( "itself": ("3rd person", "neutral", "reflexive pronoun"),
"3rd person", "they": ("3rd person", "plural", "subject pronoun"),
"neutral", "them": ("3rd person", "plural", "object pronoun"),
"reflexive pronoun" "their": ("3rd person", "plural", "possessive adjective"),
), "theirs": ("3rd person", "plural", "possessive pronoun"),
"they": ( "themselves": ("3rd person", "plural", "reflexive pronoun"),
"3rd person",
"plural",
"subject pronoun"
),
"them": (
"3rd person",
"plural",
"object pronoun"
),
"their": (
"3rd person",
"plural",
"possessive adjective"
),
"theirs": (
"3rd person",
"plural",
"possessive pronoun"
),
"themselves": (
"3rd person",
"plural",
"reflexive pronoun"
),
} }
# define the default viewpoint conversions # define the default viewpoint conversions
@ -303,9 +185,7 @@ ALIASES = {
} }
def pronoun_to_viewpoints( def pronoun_to_viewpoints(pronoun, options=None, pronoun_type=None, gender=None, viewpoint=None):
pronoun, options=None, pronoun_type=None, gender=None, viewpoint=None
):
""" """
Access function for determining the forms of a pronoun from different viewpoints. Access function for determining the forms of a pronoun from different viewpoints.
@ -365,7 +245,7 @@ def pronoun_to_viewpoints(
viewpoint = source_viewpoint viewpoint = source_viewpoint
if gender not in GENDERS: if gender not in GENDERS:
gender = source_gender[0] if is_iter(source_gender) else source_gender gender = source_gender[0] if is_iter(source_gender) else source_gender
if options: if options:
# option string/list will override the kwargs differentiators given # option string/list will override the kwargs differentiators given
if isinstance(options, str): if isinstance(options, str):

14
evennia/utils/verb_conjugation/tests.py
View file

@ -275,7 +275,7 @@ class TestPronounMapping(TestCase):
@parameterized.expand( @parameterized.expand(
[ [
("you", "you", "it"), # default 3rd is "neutral" ("you", "you", "it"), # default 3rd is "neutral"
("I", "I", "it"), ("I", "I", "it"),
("Me", "Me", "It"), ("Me", "Me", "It"),
("ours", "ours", "theirs"), ("ours", "ours", "theirs"),
@ -289,16 +289,12 @@ class TestPronounMapping(TestCase):
("themselves", "yourselves", "themselves"), ("themselves", "yourselves", "themselves"),
] ]
) )
def test_default_mapping( def test_default_mapping(self, pronoun, expected_1st_or_2nd_person, expected_3rd_person):
self, pronoun, expected_1st_or_2nd_person, expected_3rd_person
):
""" """
Test the pronoun mapper. Test the pronoun mapper.
""" """
received_1st_or_2nd_person, received_3rd_person = pronouns.pronoun_to_viewpoints( received_1st_or_2nd_person, received_3rd_person = pronouns.pronoun_to_viewpoints(pronoun)
pronoun
)
self.assertEqual(expected_1st_or_2nd_person, received_1st_or_2nd_person) self.assertEqual(expected_1st_or_2nd_person, received_1st_or_2nd_person)
self.assertEqual(expected_3rd_person, received_3rd_person) self.assertEqual(expected_3rd_person, received_3rd_person)
@ -315,8 +311,8 @@ class TestPronounMapping(TestCase):
("yourself", "f", "yourself", "herself"), ("yourself", "f", "yourself", "herself"),
("yourselves", "", "yourselves", "themselves"), ("yourselves", "", "yourselves", "themselves"),
("he", "1", "I", "he"), ("he", "1", "I", "he"),
("he", "1 p", "we", "he"), # royal we ("he", "1 p", "we", "he"), # royal we
("we", "m", "we", "he"), # royal we, other way ("we", "m", "we", "he"), # royal we, other way
("her", "p", "you", "her"), ("her", "p", "you", "her"),
("her", "pa", "your", "her"), ("her", "pa", "your", "her"),
("their", "ma", "your", "their"), ("their", "ma", "your", "their"),