diff options
| author | Kyomotoi <[email protected]> | 2020-06-21 00:30:38 +0800 |
|---|---|---|
| committer | Kyomotoi <[email protected]> | 2020-06-21 00:30:38 +0800 |
| commit | d320ea0800c02f6d67dbbd645d49d690021b1440 (patch) | |
| tree | 41495a9b75bdf89d5cf898a0b9ce6619e75b943d | |
| parent | 7d129eb9e9cca5d0a06f7e699b425306fb8ce2f6 (diff) | |
| parent | af9b3ef683d28a2e4dd3bbc23cc1b2c455fc4fe2 (diff) | |
| download | ATRI-d320ea0800c02f6d67dbbd645d49d690021b1440.tar.gz ATRI-d320ea0800c02f6d67dbbd645d49d690021b1440.tar.bz2 ATRI-d320ea0800c02f6d67dbbd645d49d690021b1440.zip | |
Merge branch 'master' of https://github.com/Kyomotoi/Aya
| -rw-r--r-- | AyaBot/plugins/covid19.py | 5 | ||||
| -rw-r--r-- | AyaBot/plugins/translate.py | 7 | ||||
| -rw-r--r-- | AyaBot/plugins/weather.py | 7 |
3 files changed, 2 insertions, 17 deletions
diff --git a/AyaBot/plugins/covid19.py b/AyaBot/plugins/covid19.py index 9917396..eee53de 100644 --- a/AyaBot/plugins/covid19.py +++ b/AyaBot/plugins/covid19.py @@ -1,11 +1,6 @@ # -*- coding:utf-8 -*- import re import json -<<<<<<< HEAD -======= -import sys -sys.path.append(r'请改成你机器人的对应目录\Aya\AyaBot\plugins\Module') ->>>>>>> af9b3ef683d28a2e4dd3bbc23cc1b2c455fc4fe2 import demjson import requests from os import path diff --git a/AyaBot/plugins/translate.py b/AyaBot/plugins/translate.py index 3cb396b..6bbb707 100644 --- a/AyaBot/plugins/translate.py +++ b/AyaBot/plugins/translate.py @@ -1,10 +1,5 @@ # -*- coding:utf-8 -*- import re -<<<<<<< HEAD -======= -import sys -sys.path.append(r'请改成你机器人的对应目录\Aya\AyaBot\plugins\Module') ->>>>>>> af9b3ef683d28a2e4dd3bbc23cc1b2c455fc4fe2 import demjson import requests from os import path @@ -46,4 +41,4 @@ async def _(session: CommandSession): msg=session.ctx['raw_message'][5:] re_msg = google_translate.translate(msg[:4999], to='en', source='zh-CN') if re_msg[0]!='': - await session.send(re_msg[0]) + await session.send(re_msg[0])
\ No newline at end of file diff --git a/AyaBot/plugins/weather.py b/AyaBot/plugins/weather.py index 414b55c..69daa71 100644 --- a/AyaBot/plugins/weather.py +++ b/AyaBot/plugins/weather.py @@ -1,11 +1,6 @@ # -*- coding:utf-8 -*- import os import re -<<<<<<< HEAD -======= -import sys -sys.path.append(r'请改成你机器人的对应目录\Aya\AyaBot\plugins\Module') ->>>>>>> af9b3ef683d28a2e4dd3bbc23cc1b2c455fc4fe2 import json import requests from os import path @@ -220,4 +215,4 @@ async def _(session: CommandSession): if not stripped_arg: session.pause('要查询的城市不能为空，请重新输入') - session.state[session.current_key] = stripped_arg + session.state[session.current_key] = stripped_arg
\ No newline at end of file |