blankie
/
sukuinote
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use client.rnd_id()

This commit is contained in:
blank X 2021-04-30 09:36:01 +07:00
parent 744832f697
commit 2cce3aa833
Signed by: blankie
GPG Key ID: CC15FC822C7F61F5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sukuinote/plugins/pyexec.py
View File

@ -41,7 +41,8 @@ async def pyexec(client, message):
if ex.msg != "'return' with value in async generator": if ex.msg != "'return' with value in async generator":
raise raise
exx = _gf(obody) exx = _gf(obody)
reply = await message.reply_text(f'Executing <code>{hash(UniqueExecReturnIdentifier)}</code>...') rnd_id = client.rnd_id()
reply = await message.reply_text(f'Executing <code>{rnd_id}</code>...')
oasync_obj = exx(client, client, message, message, reply, message.reply_to_message, message.reply_to_message, UniqueExecReturnIdentifier) oasync_obj = exx(client, client, message, message, reply, message.reply_to_message, message.reply_to_message, UniqueExecReturnIdentifier)
if inspect.isasyncgen(oasync_obj): if inspect.isasyncgen(oasync_obj):
async def async_obj(): async def async_obj():
@ -58,18 +59,18 @@ async def pyexec(client, message):
sys.stdout = wrapped_stdout sys.stdout = wrapped_stdout
sys.stderr = wrapped_stderr sys.stderr = wrapped_stderr
task = asyncio.create_task(async_obj()) task = asyncio.create_task(async_obj())
exec_tasks[hash(UniqueExecReturnIdentifier)] = task exec_tasks[rnd_id] = task
returned = await task returned = await task
except asyncio.CancelledError: except asyncio.CancelledError:
sys.stdout = stdout sys.stdout = stdout
sys.stderr = stderr sys.stderr = stderr
exec_tasks.pop(hash(UniqueExecReturnIdentifier), None) exec_tasks.pop(rnd_id, None)
await reply.edit_text('Cancelled') await reply.edit_text('Cancelled')
return return
finally: finally:
sys.stdout = stdout sys.stdout = stdout
sys.stderr = stderr sys.stderr = stderr
exec_tasks.pop(hash(UniqueExecReturnIdentifier), None) exec_tasks.pop(rnd_id, None)
wrapped_stderr.seek(0) wrapped_stderr.seek(0)
wrapped_stdout.seek(0) wrapped_stdout.seek(0)
output = '' output = ''