Răsfoiți Sursa

utf8 모두 명시

Surplus_Up (2DU) 6 ani în urmă
părinte
comite
f8a4dd6895

+ 7 - 7
emergency_tool.py

@@ -1,12 +1,12 @@
 import time
 from route.tool.func import *
 
-version_list = json.loads(open('version.json').read())
+version_list = json.loads(open('version.json', encoding='utf8').read())
 
 # DB
 while 1:
     try:
-        set_data = json.loads(open('data/set.json').read())
+        set_data = json.loads(open('data/set.json', encoding='utf8').read())
         if not 'db_type' in set_data:
             try:
                 os.remove('data/set.json')
@@ -54,10 +54,10 @@ while 1:
             if new_json[1] == '':
                 new_json[1] = 'data'
 
-            with open('data/set.json', 'w') as f:
+            with open('data/set.json', 'w', encoding='utf8') as f:
                 f.write('{ "db" : "' + new_json[1] + '", "db_type" : "' + new_json[0] + '" }')
 
-            set_data = json.loads(open('data/set.json').read())
+            set_data = json.loads(open('data/set.json', encoding='utf8').read())
 
             break
 
@@ -65,7 +65,7 @@ db_data_get(set_data['db_type'])
 
 if set_data['db_type'] == 'mysql':
     try:
-        set_data_mysql = json.loads(open('data/mysql.json').read())
+        set_data_mysql = json.loads(open('data/mysql.json', encoding='utf8').read())
     except:
         new_json = ['', '']
 
@@ -81,10 +81,10 @@ if set_data['db_type'] == 'mysql':
             if new_json[1] != '':
                 break
 
-        with open('data/mysql.json', 'w') as f:
+        with open('data/mysql.json', 'w', encoding='utf8') as f:
             f.write('{ "user" : "' + new_json[0] + '", "password" : "' + new_json[1] + '" }')
 
-        set_data_mysql = json.loads(open('data/mysql.json').read())
+        set_data_mysql = json.loads(open('data/mysql.json', encoding='utf8').read())
 
     conn = pymysql.connect(
         host = 'localhost',

+ 3 - 3
language/help_tool.py

@@ -1,11 +1,11 @@
 import re
 import json
 
-o_json = json.loads(open('en-US.json', encoding='utf-8').read())
+o_json = json.loads(open('en-US.json', encoding='utf8').read())
 
 print('n_name : ', end = '')
 n_name = input()
-n_json = json.loads(open(n_name + '.json', encoding='utf-8').read())
+n_json = json.loads(open(n_name + '.json', encoding='utf8').read())
 
 print()
 for i in list(n_json):
@@ -25,6 +25,6 @@ for i in list(o_json):
 
 n_data = json.dumps(n_json, indent = 4, ensure_ascii = False)
 
-f = open(n_name + '.json', "w", encoding='utf-8')
+f = open(n_name + '.json', "w", encoding='utf8')
 f.write(n_data)
 f.close()

+ 2 - 2
route/api_skin_info.py

@@ -11,7 +11,7 @@ def api_skin_info_2(conn, name):
     if not flask.request.args.get('all', None):
         json_address = re.sub("(((?!\.|\/).)+)\.html$", "info.json", name)
         try:
-            json_data = json.loads(open(json_address).read())
+            json_data = json.loads(open(json_address, encoding='utf8').read())
         except:
             json_data = None
 
@@ -30,7 +30,7 @@ def api_skin_info_2(conn, name):
         for i in load_skin(skin_check(1), 1):
             json_address = re.sub("(((?!\.|\/).)+)\.html$", "info.json", './views/' + i + '/index.html')
             try:
-                json_data = json.loads(open(json_address).read())
+                json_data = json.loads(open(json_address, encoding='utf8').read())
             except:
                 json_data = None
 

+ 1 - 1
route/main_error_404.py

@@ -4,6 +4,6 @@ def main_error_404_2(conn):
     curs = conn.cursor()
 
     if os.path.exists('404.html') and flask.request.path != '/':
-        return open('404.html', 'r').read()
+        return open('404.html', encoding='utf8').read()
     else:
         return redirect('/w/' + url_pas(wiki_set(2)))

+ 1 - 1
route/main_file.py

@@ -7,7 +7,7 @@ def main_file_2(conn, data):
     if data == 'easter_egg.html':
         return easy_minify(flask.render_template(skin_check(),
             imp = ['easter_egg.html', wiki_set(), custom(), other2([0, 0])],
-            data = open('./views/main_css/file/easter_egg.html', 'r').read(),
+            data = open('./views/main_css/file/easter_egg.html', encoding='utf8').read(),
             menu = 0
         ))
     elif re.search('\.txt$', data, flags = re.I) or data == 'sitemap.xml':

+ 5 - 5
route/setting.py

@@ -403,7 +403,7 @@ def setting_2(conn, num):
 
             conn.commit()
 
-            fw = open('./robots.txt', 'w')
+            fw = open('./robots.txt', 'w', encoding='utf8')
             fw.write(re.sub('\r\n', '\n', flask.request.form.get('content', '')))
             fw.close()
 
@@ -415,11 +415,11 @@ def setting_2(conn, num):
                 curs.execute(db_change('select data from other where name = "robot"'))
                 robot_test = curs.fetchall()
                 if robot_test:
-                    fw_test = open('./robots.txt', 'w')
+                    fw_test = open('./robots.txt', 'w', encoding='utf8')
                     fw_test.write(re.sub('\r\n', '\n', robot_test[0][0]))
                     fw_test.close()
                 else:
-                    fw_test = open('./robots.txt', 'w')
+                    fw_test = open('./robots.txt', 'w', encoding='utf8')
                     fw_test.write('User-agent: *\nDisallow: /\nAllow: /$\nAllow: /w/')
                     fw_test.close()
 
@@ -432,7 +432,7 @@ def setting_2(conn, num):
             else:
                 data = ''
 
-            f = open('./robots.txt', 'r')
+            f = open('./robots.txt', encoding='utf8')
             lines = f.readlines()
             f.close()
 
@@ -647,7 +647,7 @@ def setting_2(conn, num):
                 except:
                     return_json_data += ' }'
 
-            with open(app_var['path_oauth_setting'], 'w', encoding='utf-8') as f:
+            with open(app_var['path_oauth_setting'], 'w', encoding='utf8') as f:
                 f.write(return_json_data)
 
             return redirect('/oauth_setting')

+ 9 - 9
route/tool/func.py

@@ -60,7 +60,7 @@ for i in range(0, 2):
             print(e)
             raise
 
-app_var = json.loads(open('data/app_var.json').read())
+app_var = json.loads(open('data/app_var.json', encoding='utf8').read())
 
 def load_conn(data):
     global conn
@@ -121,7 +121,7 @@ def send_email(who, title, data):
 def last_change(data):
     json_address = re.sub("(((?!\.|\/).)+)\.html$", "set.json", skin_check())
     try:
-        json_data = json.loads(open(json_address).read())
+        json_data = json.loads(open(json_address, encoding='utf8').read())
     except:
         json_data = 0
 
@@ -318,7 +318,7 @@ def load_lang(data, num = 2, safe = 0):
         curs.execute(db_change("select data from other where name = 'language'"))
         rep_data = curs.fetchall()
 
-        json_data = open(os.path.join('language', rep_data[0][0] + '.json'), 'rt').read()
+        json_data = open(os.path.join('language', rep_data[0][0] + '.json'), encoding='utf8').read()
         lang = json.loads(json_data)
 
         if data in lang:
@@ -333,7 +333,7 @@ def load_lang(data, num = 2, safe = 0):
         rep_data = curs.fetchall()
         if rep_data:
             try:
-                json_data = open(os.path.join('language', rep_data[0][0] + '.json'), 'rt').read()
+                json_data = open(os.path.join('language', rep_data[0][0] + '.json'), encoding='utf8').read()
                 lang = json.loads(json_data)
             except:
                 return load_lang(data, 1, safe)
@@ -354,7 +354,7 @@ def load_oauth(provider):
         return { "support" : oauth_supported }
     else:
         try:
-            oauth = json.loads(open(app_var['path_oauth_setting']).read())
+            oauth = json.loads(open(app_var['path_oauth_setting'], encoding='utf8').read())
         except:
             return_json_data = '{ "publish_url" : "", '
 
@@ -380,16 +380,16 @@ def load_oauth(provider):
             with open(app_var['path_oauth_setting'], 'w', encoding='utf-8') as f:
                 f.write(return_json_data)
 
-            oauth = json.loads(open(app_var['path_oauth_setting']).read())
+            oauth = json.loads(open(app_var['path_oauth_setting'], encoding='utf8').read())
 
         return oauth[provider]
 
 def update_oauth(provider, target, content):
-    oauth = json.loads(open(app_var['path_oauth_setting']).read())
+    oauth = json.loads(open(app_var['path_oauth_setting'], encoding='utf8').read())
     oauth[provider][target] = content
 
-    with open(app_var['path_oauth_setting'], 'w') as f:
-        f.write(json.dumps(oauth, sort_keys=True, indent=4))
+    with open(app_var['path_oauth_setting'], 'w', encoding='utf8') as f:
+        f.write(json.dumps(oauth, sort_keys = True, indent = 4))
 
     return 'Done'