File tree 1 file changed +8
-0
lines changed
1 file changed +8
-0
lines changed Original file line number Diff line number Diff line change @@ -292,12 +292,20 @@ def unixtime(self):
292
292
try :
293
293
return time .mktime (self ._rtc .datetime )
294
294
except (ValueError , RuntimeError ) as error :
295
+ < << << << Updated upstream
295
296
print ("There was an error attempting to run time.mktime() on this board" )
297
+ == == == =
298
+ print ("Error attempting to run time.mktime() on this board\n " , error )
299
+ >> >> >> > Stashed changes
296
300
297
301
@unixtime .setter
298
302
def unixtime (self , unixtime ):
299
303
if isinstance (unixtime , int ):
300
304
try :
301
305
self ._rtc .datetime = time .localtime (unixtime )
302
306
except (ValueError , RuntimeError ) as error :
307
+ < << << << Updated upstream
303
308
print ("There was an error attempting to run time.localtime() on this board" )
309
+ == == == =
310
+ print ("Error attempting to run time.localtime() on this board\n " , error )
311
+ >> >> >> > Stashed changes
You can’t perform that action at this time.
0 commit comments