Commitbcd10f7

authored

Always store the original field assignment onFieldInfo (#11946)

1 parent43bbdc0 commitbcd10f7Copy full SHA for bcd10f7

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -334,12 +334,13 @@ def collect_model_fields( # noqa: C901`
`334`	`334`	`)`
`335`	`335`
`336`	`336`	`field_info=FieldInfo_.from_annotated_attribute(ann_type,assigned_value,_source=AnnotationSource.CLASS)`
	`337`	`+# Store the original annotation and assignment value that should be used to rebuild the field info later.`
	`338`	`+# Note that the assignment is always stored as the annotation might contain a type var that is later`
	`339`	`+# parameterized with an unknown forward reference (and we'll need it to rebuild the field info):`
	`340`	`+field_info._original_assignment=original_assignment`
`337`	`341`	`ifnotevaluated:`
`338`	`342`	`field_info._complete=False`
`339`		`-# Store the original annotation and assignment value that should be used to rebuild`
`340`		`-# the field info later:`
`341`	`343`	`field_info._original_annotation=ann_type`
`342`		`-field_info._original_assignment=original_assignment`
`343`	`344`	`elif'final'infield_info._qualifiersandnotfield_info.is_required():`
`344`	`345`	`warnings.warn(`
`345`	`346`	`f'Annotation{ann_name!r} is marked as final and has a default value. Pydantic treats{ann_name!r} as a '`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`importpytest`
`9`	`9`
`10`		`-frompydanticimportBaseModel,PydanticUserError,TypeAdapter,ValidationError`
	`10`	`+frompydanticimportBaseModel,Field,PydanticUserError,TypeAdapter,ValidationError`
`11`	`11`
`12`	`12`
`13`	`13`	`deftest_postponed_annotations(create_module):`
`@@ -1239,11 +1239,11 @@ class SubChild(Child):`
`1239`	`1239`	`),`
`1240`	`1240`	`)`
`1241`	`1241`	`deftest_forward_ref_in_class_parameter()->None:`
`1242`		`-"""https://github.com/pydantic/pydantic/issues/11854"""`
	`1242`	`+"""https://github.com/pydantic/pydantic/issues/11854, https://github.com/pydantic/pydantic/issues/11920"""`
`1243`	`1243`	`T=TypeVar('T')`
`1244`	`1244`
`1245`	`1245`	`classModel(BaseModel,Generic[T]):`
`1246`		`-f:T`
	`1246`	`+f:T=Field(json_schema_extra={'extra':'value'})`
`1247`	`1247`
`1248`	`1248`	`M=Model[list['Undefined']]`
`1249`	`1249`
`@@ -1253,6 +1253,7 @@ class Model(BaseModel, Generic[T]):`
`1253`	`1253`
`1254`	`1254`	`assertM.__pydantic_fields_complete__`
`1255`	`1255`	`assertM.model_fields['f'].annotation==list[int]`
	`1256`	`+assertM.model_fields['f'].json_schema_extra== {'extra':'value'}`
`1256`	`1257`
`1257`	`1258`
`1258`	`1259`	`deftest_uses_the_local_namespace_when_generating_schema():`

Comments

(0)