Skip to content

Commit

Permalink
change keywords deprecated by marshmallow
Browse files Browse the repository at this point in the history
  • Loading branch information
@mscarey
mscarey committed Jul 25, 2021
1 parent 1beafff commit 184e929
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 69 deletions.
64 changes: 32 additions & 32 deletions authorityspoke/io/schemas_json.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ class FactSchema(Schema):
__model__: Type = Fact
predicate = fields.Nested(PredicateSchema)
terms = fields.Nested(lambda: FactorSchema(many=True))
standard_of_proof = fields.Str(missing=None)
name = fields.Str(missing=None)
absent = fields.Bool(missing=False)
generic = fields.Bool(missing=False)
standard_of_proof = fields.Str(load_default=None)
name = fields.Str(load_default=None)
absent = fields.Bool(load_default=False)
generic = fields.Bool(load_default=False)

@post_load
def make_object(self, data: RawFactor, **kwargs) -> Fact:
Expand Down Expand Up @@ -88,12 +88,12 @@ class ExhibitSchema(Schema):
"""

__model__: Type = Exhibit
form = fields.Str(missing=None)
statement = fields.Nested(FactSchema, missing=None)
statement_attribution = fields.Nested(EntitySchema, missing=None)
name = fields.Str(missing=None)
absent = fields.Bool(missing=False)
generic = fields.Bool(missing=False)
form = fields.Str(load_default=None)
statement = fields.Nested(FactSchema, load_default=None)
statement_attribution = fields.Nested(EntitySchema, load_default=None)
name = fields.Str(load_default=None)
absent = fields.Bool(load_default=False)
generic = fields.Bool(load_default=False)

@post_load
def make_object(self, data: RawFactor, **kwargs) -> Exhibit:
Expand All @@ -114,10 +114,10 @@ class PleadingSchema(Schema):
"""

__model__: Type = Pleading
filer = fields.Nested(EntitySchema, missing=None)
name = fields.Str(missing=None)
absent = fields.Bool(missing=False)
generic = fields.Bool(missing=False)
filer = fields.Nested(EntitySchema, load_default=None)
name = fields.Str(load_default=None)
absent = fields.Bool(load_default=False)
generic = fields.Bool(load_default=False)

@post_load
def make_pleading(self, data: RawFactor, **kwargs) -> Pleading:
Expand All @@ -128,11 +128,11 @@ class AllegationSchema(Schema):
"""Schema for an Allegation of a Fact."""

__model__: Type = Allegation
pleading = fields.Nested(PleadingSchema, missing=None)
statement = fields.Nested(FactSchema, missing=None)
name = fields.Str(missing=None)
absent = fields.Bool(missing=False)
generic = fields.Bool(missing=False)
pleading = fields.Nested(PleadingSchema, load_default=None)
statement = fields.Nested(FactSchema, load_default=None)
name = fields.Str(load_default=None)
absent = fields.Bool(load_default=False)
generic = fields.Bool(load_default=False)

@post_load
def make_allegation(self, data: RawFactor, **kwargs) -> Allegation:
Expand Down Expand Up @@ -168,11 +168,11 @@ class EvidenceSchema(Schema):
"""

__model__: Type = Evidence
exhibit = fields.Nested(ExhibitSchema, missing=None)
to_effect = fields.Nested(FactSchema, missing=None)
name = fields.Str(missing=None)
absent = fields.Bool(missing=False)
generic = fields.Bool(missing=False)
exhibit = fields.Nested(ExhibitSchema, load_default=None)
to_effect = fields.Nested(FactSchema, load_default=None)
name = fields.Str(load_default=None)
absent = fields.Bool(load_default=False)
generic = fields.Bool(load_default=False)

@post_load
def make_evidence(self, data: RawFactor, **kwargs) -> Evidence:
Expand Down Expand Up @@ -284,10 +284,10 @@ class RuleSchema(Schema):
procedure = fields.Nested(ProcedureSchema)
enactments = fields.Nested(EnactmentSchema, many=True)
enactments_despite = fields.Nested(EnactmentSchema, many=True)
mandatory = fields.Bool(missing=False)
universal = fields.Bool(missing=False)
name = fields.Str(missing=None)
generic = fields.Bool(missing=False)
mandatory = fields.Bool(load_default=False)
universal = fields.Bool(load_default=False)
name = fields.Str(load_default=None)
generic = fields.Bool(load_default=False)

@post_load
def make_object(self, data, **kwargs):
Expand Down Expand Up @@ -329,10 +329,10 @@ class HoldingSchema(Schema):

__model__: Type = Holding
rule = fields.Nested(RuleSchema)
rule_valid = fields.Bool(missing=True)
decided = fields.Bool(missing=True)
exclusive = fields.Bool(missing=False)
generic = fields.Bool(missing=False)
rule_valid = fields.Bool(load_default=True)
decided = fields.Bool(load_default=True)
exclusive = fields.Bool(load_default=False)
generic = fields.Bool(load_default=False)
anchors = fields.Nested(SelectorSchema, many=True)

@post_load
Expand Down
74 changes: 37 additions & 37 deletions authorityspoke/io/schemas_yaml.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,13 @@ class PredicateSchema(ExpandableSchema):
content = fields.Method(
serialize="get_content_with_placeholders", deserialize="get_content_field"
)
truth = fields.Bool(missing=True)
truth = fields.Bool(load_default=True)
sign = fields.Str(
missing=None,
load_default=None,
validate=validate.OneOf([""] + list(QuantityRange.opposite_comparisons.keys())),
)
expression = fields.Function(
dump_quantity, deserialize=Comparison.read_quantity, missing=None
dump_quantity, deserialize=Comparison.read_quantity, load_default=None
)

def get_content_with_placeholders(self, obj) -> str:
Expand Down Expand Up @@ -220,8 +220,8 @@ class EntitySchema(ExpandableSchema):
"""

__model__: Type = Entity
name = fields.Str(missing=None)
generic = fields.Bool(missing=True)
name = fields.Str(load_default=None)
generic = fields.Bool(load_default=True)
plural = fields.Bool()


Expand All @@ -240,10 +240,10 @@ class FactSchema(ExpandableSchema):
__model__: Type = Fact
predicate = fields.Nested(PredicateSchema)
terms = fields.Nested(lambda: FactorSchema(many=True))
standard_of_proof = fields.Str(missing=None)
name = fields.Str(missing=None)
absent = fields.Bool(missing=False)
generic = fields.Bool(missing=False)
standard_of_proof = fields.Str(load_default=None)
name = fields.Str(load_default=None)
absent = fields.Bool(load_default=False)
generic = fields.Bool(load_default=False)

def get_references_from_mentioned(
self,
Expand Down Expand Up @@ -344,12 +344,12 @@ class ExhibitSchema(ExpandableSchema):
"""

__model__: Type = Exhibit
form = fields.Str(missing=None)
statement = fields.Nested(FactSchema, missing=None)
statement_attribution = fields.Nested(EntitySchema, missing=None)
name = fields.Str(missing=None)
absent = fields.Bool(missing=False)
generic = fields.Bool(missing=False)
form = fields.Str(load_default=None)
statement = fields.Nested(FactSchema, load_default=None)
statement_attribution = fields.Nested(EntitySchema, load_default=None)
name = fields.Str(load_default=None)
absent = fields.Bool(load_default=False)
generic = fields.Bool(load_default=False)

@post_load
def make_object(self, data: RawFactor, **kwargs) -> Exhibit:
Expand All @@ -361,32 +361,32 @@ class PleadingSchema(ExpandableSchema):
"""Schema for a document to link Allegations to."""

__model__: Type = Pleading
filer = fields.Nested(EntitySchema, missing=None)
name = fields.Str(missing=None)
absent = fields.Bool(missing=False)
generic = fields.Bool(missing=False)
filer = fields.Nested(EntitySchema, load_default=None)
name = fields.Str(load_default=None)
absent = fields.Bool(load_default=False)
generic = fields.Bool(load_default=False)


class AllegationSchema(ExpandableSchema):
"""Schema for an Allegation of a Fact."""

__model__: Type = Allegation
pleading = fields.Nested(PleadingSchema, missing=None)
statement = fields.Nested(FactSchema, missing=None)
name = fields.Str(missing=None)
absent = fields.Bool(missing=False)
generic = fields.Bool(missing=False)
pleading = fields.Nested(PleadingSchema, load_default=None)
statement = fields.Nested(FactSchema, load_default=None)
name = fields.Str(load_default=None)
absent = fields.Bool(load_default=False)
generic = fields.Bool(load_default=False)


class EvidenceSchema(ExpandableSchema):
"""Schema for an Exhibit and a reference to the Fact it would support."""

__model__: Type = Evidence
exhibit = fields.Nested(ExhibitSchema, missing=None)
to_effect = fields.Nested(FactSchema, missing=None)
name = fields.Str(missing=None)
absent = fields.Bool(missing=False)
generic = fields.Bool(missing=False)
exhibit = fields.Nested(ExhibitSchema, load_default=None)
to_effect = fields.Nested(FactSchema, load_default=None)
name = fields.Str(load_default=None)
absent = fields.Bool(load_default=False)
generic = fields.Bool(load_default=False)


class FactorSchema(OneOfSchema, ExpandableSchema):
Expand Down Expand Up @@ -452,10 +452,10 @@ class RuleSchema(ExpandableSchema):
procedure = fields.Nested(ProcedureSchema)
enactments = fields.Nested(EnactmentSchema, many=True)
enactments_despite = fields.Nested(EnactmentSchema, many=True)
mandatory = fields.Bool(missing=False)
universal = fields.Bool(missing=False)
name = fields.Str(missing=None)
generic = fields.Bool(missing=False)
mandatory = fields.Bool(load_default=False)
universal = fields.Bool(load_default=False)
name = fields.Str(load_default=None)
generic = fields.Bool(load_default=False)

@pre_load
def format_data_to_load(self, data: Dict, **kwargs) -> RawRule:
Expand All @@ -479,10 +479,10 @@ class HoldingSchema(ExpandableSchema):

__model__: Type = Holding
rule = fields.Nested(RuleSchema)
rule_valid = fields.Bool(missing=True)
decided = fields.Bool(missing=True)
exclusive = fields.Bool(missing=False)
generic = fields.Bool(missing=False)
rule_valid = fields.Bool(load_default=True)
decided = fields.Bool(load_default=True)
exclusive = fields.Bool(load_default=False)
generic = fields.Bool(load_default=False)
anchors = fields.Nested(SelectorSchema, many=True)

def nest_fields_inside_rule(self, data: Dict) -> RawHolding:
Expand Down

0 comments on commit 184e929

Please sign in to comment.