File tree Expand file tree Collapse file tree 1 file changed +2
-11
lines changed Expand file tree Collapse file tree 1 file changed +2
-11
lines changed Original file line number Diff line number Diff line change @@ -105,11 +105,8 @@ def numpyJSONEncoder(self, obj):
105105 return float ('nan' )
106106
107107 if type (obj ).__module__ .split ('.' )[0 ] == numpy .__name__ :
108- l = obj .tolist ()
109- try :
110- return self .datetimeJSONEncoder (l )
111- except NotEncodable :
112- return l
108+ return obj .tolist ()
109+
113110 else :
114111 raise NotEncodable
115112
@@ -133,12 +130,6 @@ def datetimeJSONEncoder(self, obj):
133130 return obj .strftime ('%Y-%m-%d %H:%M:%S' )
134131 else :
135132 return obj .strftime ('%Y-%m-%d' )
136- elif isinstance (obj [0 ], (datetime .datetime , datetime .date )):
137- return [o .strftime (
138- '%Y-%m-%d %H:%M:%S.%f' ) if o .microsecond else
139- o .strftime ('%Y-%m-%d %H:%M:%S' ) if any ((o .second , o .minute , o .hour )) else
140- o .strftime ('%Y-%m-%d' )
141- for o in obj ]
142133 else :
143134 raise NotEncodable
144135
You can’t perform that action at this time.
0 commit comments