From 7d129eb9e9cca5d0a06f7e699b425306fb8ce2f6 Mon Sep 17 00:00:00 2001
From: Kyomotoi <1172294279@qq.com>
Date: Sun, 21 Jun 2020 00:29:51 +0800
Subject: (FIX)

---
 AyaBot/plugins/weather.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'AyaBot/plugins/weather.py')

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
-- 
cgit v1.2.3