2du 4 лет назад
Родитель
Сommit
8aa12b3281
9 измененных файлов с 10 добавлено и 7 удалено
  1. 1 1
      app.py
  2. BIN
      new2.db-shm
  3. BIN
      new2.db-wal
  4. 1 0
      readme-en.md
  5. 1 0
      readme.md
  6. 0 1
      route/edit.py
  7. 5 3
      route/tool/func.py
  8. 1 1
      version.json
  9. 1 1
      views/main_css/js/render_onmark.js

+ 1 - 1
app.py

@@ -240,7 +240,7 @@ app = flask.Flask(
 app.config['JSON_AS_ASCII'] = False
 app.config['JSONIFY_PRETTYPRINT_REGULAR'] = True
 
-log = logging.getLogger('werkzeug')
+log = logging.getLogger('waitress')
 log.setLevel(logging.ERROR)
 
 app.jinja_env.filters['md5_replace'] = md5_replace



+ 1 - 0
readme-en.md

@@ -2,6 +2,7 @@
 
 # openNAMU
 [![Up to Python 3.7](https://img.shields.io/badge/python->=%203.7-blue.svg)](https://python.org)
+[![Up to PyPy 3.7](https://img.shields.io/badge/pypy3-%3E=%203.7-blue.svg)](https://www.pypy.org/)
 [![LICENSE](https://img.shields.io/badge/license-BSD%203--Clause-lightgrey.svg)](./LICENSE)
 
 ![](https://raw.githubusercontent.com/openNAMU/openNAMU/beta/.github/logo.png)

+ 1 - 0
readme.md

@@ -2,6 +2,7 @@
 
 # 오픈나무
 [![Python 3.7 이상](https://img.shields.io/badge/python->=%203.7-blue.svg)](https://python.org)
+[![PyPy 3.7 이상](https://img.shields.io/badge/pypy3-%3E=%203.7-blue.svg)](https://www.pypy.org/)
 [![라이선스](https://img.shields.io/badge/license-BSD%203--Clause-lightgrey.svg)](./LICENSE)
 
 ![](https://raw.githubusercontent.com/openNAMU/openNAMU/beta/.github/logo.png)

+ 0 - 1
route/edit.py

@@ -86,7 +86,6 @@ def edit(name = 'Test', name_load = 0, section = 0):
             editor_top_text = ''
             if edit_repeat == 'get':
                 load_title = name_load
-                print(load_title, section)
                 if load_title == 0 and section == '':
                     load_title = name
                     editor_top_text += '<a href="/manager/15/' + url_pas(name) + '">(' + load_lang('load') + ')</a> '

+ 5 - 3
route/tool/func.py

@@ -85,7 +85,7 @@ global_wiki_set = {}
 
 global_db_set = ''
 
-data_css_ver = '122'
+data_css_ver = '123'
 data_css = ''
 
 conn = ''
@@ -112,7 +112,8 @@ class get_db_connect_old:
         if self.db_set['type'] == 'sqlite':
             self.conn = sqlite3.connect(
                 self.db_set['name'] + '.db',
-                check_same_thread = False
+                check_same_thread = False,
+                isolation_level = None
             )
             self.conn.execute('pragma journal_mode = wal')
         else:
@@ -164,7 +165,8 @@ class get_db_connect:
         if self.db_set['type'] == 'sqlite':
             self.conn = sqlite3.connect(
                 self.db_set['name'] + '.db',
-                check_same_thread = False
+                check_same_thread = False,
+                isolation_level = None
             )
             self.conn.execute('pragma journal_mode = wal')
         else:

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.3 (stable2) (beta20) (dev35)",
+        "r_ver" : "v3.4.3 (stable2) (beta20) (dev36)",
         "c_ver" : "3500101",
         "s_ver" : "3500110"
     }

+ 1 - 1
views/main_css/js/render_onmark.js

@@ -187,7 +187,7 @@ function do_onmark_heading_render(
         
         var heading_data_text = heading_data[3].replace(/=+$/, '');
         heading_data_text = heading_data_text.replace(/#$/, '');
-        ading_data_text = heading_data_text.replace(/ $/, '');
+        heading_data_text = heading_data_text.replace(/ $/, '');
         
         toc_data += '' +
             '<span style="margin-left: ' + String((heading_level_string.match(/\./g).length - 1) * 10) + 'px;">' +