mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 13:17:00 +08:00
merge alas
This commit is contained in:
@@ -3,7 +3,6 @@ from datetime import datetime, timedelta
|
||||
from functools import wraps
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
# def timeout(_timeout):
|
||||
# threadstop = thread._thread__stop
|
||||
# from threading import thread
|
||||
@@ -71,8 +70,6 @@ def timeout(func, timeout_sec=30.0, *args, **kwargs):
|
||||
return function_timeout(func)
|
||||
|
||||
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
def timer(function):
|
||||
@wraps(function)
|
||||
def function_timer(*args, **kwargs):
|
||||
|
||||
Reference in New Issue
Block a user