2 붙은 함수명 제거

app.py

@@ -579,13 +579,13 @@ app.route('/auth/ban_regex/<everything:name>', methods = ['POST', 'GET'], defaul
 # /auth/list
 # /auth/list/add/<name>
 # /auth/list/delete/<name>
-app.route('/auth/list')(list_admin_group_2)
+app.route('/auth/list')(list_admin_group)
 app.route('/auth/list/add/<name>', methods = ['POST', 'GET'])(give_admin_groups)
-app.route('/auth/list/delete/<name>', methods = ['POST', 'GET'])(give_delete_admin_group_2)
+app.route('/auth/list/delete/<name>', methods = ['POST', 'GET'])(give_delete_admin_group)
 
 app.route('/auth/give/fix/<user_name>', methods = ['POST', 'GET'])(give_user_fix)
 
-app.route('/app_submit', methods = ['POST', 'GET'])(recent_app_submit_2)
+app.route('/app_submit', methods = ['POST', 'GET'])(recent_app_submit)
 
 # /auth/history
 app.route('/recent_block')(list_recent_block)
@@ -723,7 +723,6 @@ app.route('/user')(user_info)
 app.route('/user/<name>')(user_info)
 
 app.route('/challenge', methods = ['GET', 'POST'])(user_challenge)
-app.route('/rankup')(user_rankup)
 
 app.route('/edit_filter/<name>', methods = ['GET', 'POST'])(user_edit_filter)
 
@@ -743,9 +742,9 @@ app.route('/star_doc/<everything:name>', defaults = { 'tool' : 'star_doc' })(use
 app.route('/star_doc_from/<everything:name>', defaults = { 'tool' : 'star_doc_from' })(user_watch_list_name)
 
 # 개편 보류중 S
-app.route('/change/email', methods = ['POST', 'GET'])(user_setting_email_2)
+app.route('/change/email', methods = ['POST', 'GET'])(user_setting_email)
 app.route('/change/email/delete')(user_setting_email_delete)
-app.route('/change/email/check', methods = ['POST', 'GET'])(user_setting_email_check_2)
+app.route('/change/email/check', methods = ['POST', 'GET'])(user_setting_email_check)
 # 개편 보류중 E
 
 # Func-login
@@ -755,12 +754,12 @@ app.route('/change/email/check', methods = ['POST', 'GET'])(user_setting_email_c
 # register -> register/email -> regiter/email/check with reg_id
 # pass_find -> pass_find/email with find_id
 
-app.route('/login', methods = ['POST', 'GET'])(login_login_2)
-app.route('/login/2fa', methods = ['POST', 'GET'])(login_login_2fa_2)
-app.route('/register', methods = ['POST', 'GET'])(login_register_2)
-app.route('/register/email', methods = ['POST', 'GET'])(login_register_email_2)
-app.route('/register/email/check', methods = ['POST', 'GET'])(login_register_email_check_2)
-app.route('/register/submit', methods = ['POST', 'GET'])(login_register_submit_2)
+app.route('/login', methods = ['POST', 'GET'])(login_login)
+app.route('/login/2fa', methods = ['POST', 'GET'])(login_login_2fa)
+app.route('/register', methods = ['POST', 'GET'])(login_register)
+app.route('/register/email', methods = ['POST', 'GET'])(login_register_email)
+app.route('/register/email/check', methods = ['POST', 'GET'])(login_register_email_check)
+app.route('/register/submit', methods = ['POST', 'GET'])(login_register_submit)
 
 app.route('/login/find')(login_find)
 app.route('/login/find/key', methods = ['POST', 'GET'])(login_find_key)
@@ -859,8 +858,8 @@ app.route('/api/v2/recent_block/<set_type>/<int:num>')(api_list_recent_block)
 app.route('/api/v2/recent_block/<set_type>/<int:num>/<everything:why>')(api_list_recent_block)
 app.route('/api/v2/recent_block_user/<set_type>/<int:num>/<user_name>')(api_list_recent_block)
 app.route('/api/v2/recent_block_user/<set_type>/<int:num>/<user_name>/<everything:why>')(api_list_recent_block)
-app.route('/api/v2/list/document/old/<int:num>', defaults = { 'set_type' : 'old' })(api_list_old_page)
-app.route('/api/v2/list/document/new/<int:num>', defaults = { 'set_type' : 'new' })(api_list_old_page)
+app.route('/api/v2/list/document/old/<int:num>', defaults = { 'set_type' : 'old' })(api_list_old_page_exter)
+app.route('/api/v2/list/document/new/<int:num>', defaults = { 'set_type' : 'new' })(api_list_old_page_exter)
 app.route('/api/v2/list/document/<int:num>')(api_list_title_index)
 app.route('/api/v2/list/auth')(api_list_auth)
 app.route('/api/v2/list/markup')(api_list_markup)

route/__init__.py

@@ -30,14 +30,15 @@ from route.filter_all_add import filter_all_add
 from route.filter_all_delete import filter_all_delete
 
 from route.give_admin_groups import give_admin_groups
-from route.give_delete_admin_group import give_delete_admin_group_2
+from route.give_delete_admin_group import give_delete_admin_group
 from route.give_user_ban import give_user_ban
 from route.give_user_fix import give_user_fix
 
 from route.list_acl import list_acl
 from route.list_admin import list_admin
 from route.list_admin_auth_use import list_admin_auth_use
-from route.list_admin_group import list_admin_group_2
+from route.list_old_page import list_old_page
+from route.list_admin_group import list_admin_group
 from route.list_image_file import list_image_file
 from route.list_long_page import list_long_page
 from route.list_no_link import list_no_link
@@ -52,15 +53,15 @@ from route.login_find import login_find
 from route.login_find_email import login_find_email
 from route.login_find_email_check import login_find_email_check
 from route.login_find_key import login_find_key
-from route.login_login import login_login_2
-from route.login_login_2fa import login_login_2fa_2
-from route.login_login_2fa_email import login_login_2fa_email_2
+from route.login_login import login_login
+from route.login_login_2fa import login_login_2fa
+from route.login_login_2fa_email import login_login_2fa_email
 from route.login_logout import login_logout
 
-from route.login_register import login_register_2
-from route.login_register_email import login_register_email_2
-from route.login_register_email_check import login_register_email_check_2
-from route.login_register_submit import login_register_submit_2
+from route.login_register import login_register
+from route.login_register_email import login_register_email
+from route.login_register_email_check import login_register_email_check
+from route.login_register_submit import login_register_submit
 
 from route.main_func_error_404 import main_func_error_404
 
@@ -93,7 +94,7 @@ from route.main_view import main_view
 from route.main_view_file import main_view_file
 from route.main_view_image import main_view_image
 
-from route.recent_app_submit import recent_app_submit_2
+from route.recent_app_submit import recent_app_submit
 
 from route.recent_change import recent_change
 from route.recent_edit_request import recent_edit_request
@@ -125,8 +126,8 @@ from route.user_info import user_info
 from route.user_edit_filter import user_edit_filter
 
 from route.user_setting import user_setting
-from route.user_setting_email import user_setting_email_2
-from route.user_setting_email_check import user_setting_email_check_2
+from route.user_setting_email import user_setting_email
+from route.user_setting_email_check import user_setting_email_check
 from route.user_setting_email_delete import user_setting_email_delete
 from route.user_setting_head import user_setting_head
 from route.user_setting_head_reset import user_setting_head_reset
@@ -159,13 +160,10 @@ from route.vote_select import vote_select
 from route.n_list_recent_change import list_recent_change
 from route.n_list_recent_discuss import list_recent_discuss
 from route.n_list_recent_block import list_recent_block
-from route.n_list_old_page import list_old_page
 from route.n_list_user_check_submit import list_user_check_submit
 
 from route.n_w_watch_list import w_watch_list
 
-from route.n_user_rankup import user_rankup
-
 from route.n_topic_list import topic_list
 
 from route.n_give_auth import give_auth
@@ -195,7 +193,7 @@ from route.go_api_list_recent_change import api_list_recent_change
 from route.go_api_list_recent_discuss import api_list_recent_discuss
 from route.go_api_list_recent_block import api_list_recent_block
 from route.go_api_list_recent_edit_request import api_list_recent_edit_request, api_list_recent_edit_request_exter
-from route.go_api_list_old_page import api_list_old_page
+from route.go_api_list_old_page import api_list_old_page, api_list_old_page_exter
 from route.go_api_list_title_index import api_list_title_index
 from route.go_api_list_acl import api_list_acl
 from route.go_api_list_auth import api_list_auth

route/give_delete_admin_group.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-async def give_delete_admin_group_2(name = 'test'):
+async def give_delete_admin_group(name = 'test'):
     with get_db_connect() as conn:
         curs = conn.cursor()
 

route/go_api_list_old_page.py

@@ -4,5 +4,8 @@ async def api_list_old_page(num = 1, set_type = 'old'):
     other_set = {}
     other_set["num"] = str(num)
     other_set["set_type"] = set_type
-    
-    return flask.jsonify(await python_to_golang(sys._getframe().f_code.co_name, other_set))
+
+    return await python_to_golang(sys._getframe().f_code.co_name, other_set)
+
+async def api_list_old_page_exter(num = 1, set_type = 'old'):
+    return flask.jsonify(await api_list_old_page(num, set_type))

route/list_admin_group.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-async def list_admin_group_2():
+async def list_admin_group():
     with get_db_connect() as conn:
         curs = conn.cursor()
 

route/n_list_old_page.py → route/list_old_page.py

@@ -10,10 +10,6 @@ async def list_old_page(num = 1, set_type = 'old'):
 
         return easy_minify(conn, flask.render_template(skin_check(conn),
             imp = [title, wiki_set(conn), await wiki_custom(conn), wiki_css([0, 0])],
-            data = '' + \
-                '<div id="opennamu_list_old_page"></div>' + \
-                '<script defer src="/views/main_css/js/route/list_old_page.js' + cache_v() + '"></script>' + \
-                '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_list_old_page(); });</script>' + \
-            '',
+            data = '',
             menu = [['other', get_lang(conn, 'return')]]
         ))

route/login_login.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-async def login_login_2():
+async def login_login():
     with get_db_connect() as conn:
         curs = conn.cursor()
 

route/login_login_2fa.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-async def login_login_2fa_2():
+async def login_login_2fa():
     with get_db_connect() as conn:
         curs = conn.cursor()
 

route/login_login_2fa_email.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-async def login_login_2fa_email_2():
+async def login_login_2fa_email():
     with get_db_connect() as conn:
         curs = conn.cursor()
 

route/login_register.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-async def login_register_2():
+async def login_register():
     with get_db_connect() as conn:
         curs = conn.cursor()
 

route/login_register_email.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-async def login_register_email_2():
+async def login_register_email():
     with get_db_connect() as conn:
         curs = conn.cursor()
 

route/login_register_email_check.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-async def login_register_email_check_2():
+async def login_register_email_check():
     with get_db_connect() as conn:
         curs = conn.cursor()
 

route/login_register_submit.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-async def login_register_submit_2():
+async def login_register_submit():
     with get_db_connect() as conn:
         curs = conn.cursor()
 

route/recent_app_submit.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-async def recent_app_submit_2():
+async def recent_app_submit():
     with get_db_connect() as conn:
         curs = conn.cursor()
 

route/user_setting_email.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-async def user_setting_email_2():
+async def user_setting_email():
     with get_db_connect() as conn:
         curs = conn.cursor()
 

route/user_setting_email_check.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-async def user_setting_email_check_2():
+async def user_setting_email_check():
     with get_db_connect() as conn:
         curs = conn.cursor()