@@ -32,7 +32,6 @@ def jsonable_encoder(
32
32
exclude_defaults : bool = False ,
33
33
exclude_none : bool = False ,
34
34
custom_encoder : dict = {},
35
- sqlalchemy_safe : bool = True ,
36
35
) -> Any :
37
36
if include is not None and not isinstance (include , set ):
38
37
include = set (include )
@@ -57,7 +56,6 @@ def jsonable_encoder(
57
56
exclude_none = exclude_none ,
58
57
exclude_defaults = exclude_defaults ,
59
58
custom_encoder = encoder ,
60
- sqlalchemy_safe = sqlalchemy_safe ,
61
59
)
62
60
if isinstance (obj , Enum ):
63
61
return obj .value
@@ -68,30 +66,22 @@ def jsonable_encoder(
68
66
if isinstance (obj , dict ):
69
67
encoded_dict = {}
70
68
for key , value in obj .items ():
71
- if (
72
- (
73
- not sqlalchemy_safe
74
- or (not isinstance (key , str ))
75
- or (not key .startswith ("_sa" ))
76
- )
77
- and (value is not None or not exclude_none )
78
- and ((include and key in include ) or not exclude or key not in exclude )
69
+ if (value is not None or not exclude_none ) and (
70
+ (include and key in include ) or not exclude or key not in exclude
79
71
):
80
72
encoded_key = jsonable_encoder (
81
73
key ,
82
74
by_alias = by_alias ,
83
75
exclude_unset = exclude_unset ,
84
76
exclude_none = exclude_none ,
85
77
custom_encoder = custom_encoder ,
86
- sqlalchemy_safe = sqlalchemy_safe ,
87
78
)
88
79
encoded_value = jsonable_encoder (
89
80
value ,
90
81
by_alias = by_alias ,
91
82
exclude_unset = exclude_unset ,
92
83
exclude_none = exclude_none ,
93
84
custom_encoder = custom_encoder ,
94
- sqlalchemy_safe = sqlalchemy_safe ,
95
85
)
96
86
encoded_dict [encoded_key ] = encoded_value
97
87
return encoded_dict
@@ -108,7 +98,6 @@ def jsonable_encoder(
108
98
exclude_defaults = exclude_defaults ,
109
99
exclude_none = exclude_none ,
110
100
custom_encoder = custom_encoder ,
111
- sqlalchemy_safe = sqlalchemy_safe ,
112
101
)
113
102
)
114
103
return encoded_list
@@ -144,5 +133,4 @@ def jsonable_encoder(
144
133
exclude_defaults = exclude_defaults ,
145
134
exclude_none = exclude_none ,
146
135
custom_encoder = custom_encoder ,
147
- sqlalchemy_safe = sqlalchemy_safe ,
148
136
)
0 commit comments