summaryrefslogtreecommitdiff
path: root/AyaBot/plugins/weather.py
diff options
context:
space:
mode:
authorKyomotoi <[email protected]>2020-06-21 00:29:51 +0800
committerKyomotoi <[email protected]>2020-06-21 00:29:51 +0800
commit7d129eb9e9cca5d0a06f7e699b425306fb8ce2f6 (patch)
tree37042c9792336747942c304e7a07a49f97dbe1a0 /AyaBot/plugins/weather.py
parentcc9ce1bfcd695c74fd3d2dbdc39bd147d444e6b7 (diff)
downloadATRI-7d129eb9e9cca5d0a06f7e699b425306fb8ce2f6.tar.gz
ATRI-7d129eb9e9cca5d0a06f7e699b425306fb8ce2f6.tar.bz2
ATRI-7d129eb9e9cca5d0a06f7e699b425306fb8ce2f6.zip
(FIX)
Diffstat (limited to 'AyaBot/plugins/weather.py')
-rw-r--r--AyaBot/plugins/weather.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/AyaBot/plugins/weather.py b/AyaBot/plugins/weather.py
index 158cde2..414b55c 100644
--- a/AyaBot/plugins/weather.py
+++ b/AyaBot/plugins/weather.py
@@ -1,12 +1,16 @@
# -*- coding:utf-8 -*-
import os
import re
+<<<<<<< HEAD
+=======
import sys
-sys.path.append('D:\\code\\Aya\\AyaBot\\plugins\\Module')
+sys.path.append(r'请改成你机器人的对应目录\Aya\AyaBot\plugins\Module')
+>>>>>>> af9b3ef683d28a2e4dd3bbc23cc1b2c455fc4fe2
import json
import requests
+from os import path
from nonebot import on_command, CommandSession
-import google_translate
+from AyaBot.plugins.module import google_translate
API_URL = 'https://api.weatherbit.io/v2.0/current?city='
API_URL_2 = '&key=1df2eb2951f3470a94cb323bb4647c18'
@@ -216,4 +220,4 @@ async def _(session: CommandSession):
if not stripped_arg:
session.pause('要查询的城市不能为空,请重新输入')
- session.state[session.current_key] = stripped_arg \ No newline at end of file
+ session.state[session.current_key] = stripped_arg