2DU 9 år sedan
förälder
incheckning
17c1133bc1
2 ändrade filer med 12 tillägg och 12 borttagningar
  1. 2 2
      app.py
  2. 10 10
      set/set.json

+ 2 - 2
app.py

@@ -8,7 +8,7 @@ import time
 import re
 import re
 import bcrypt
 import bcrypt
 
 
-json_data=open('set.json').read()
+json_data = open('set.json').read()
 data = json.loads(json_data)
 data = json.loads(json_data)
 
 
 conn = pymysql.connect(host = data['host'], user = data['user'], password = data['pw'], db = data['db'], charset = 'utf8')
 conn = pymysql.connect(host = data['host'], user = data['user'], password = data['pw'], db = data['db'], charset = 'utf8')
@@ -133,7 +133,7 @@ def namumark(title, data):
             data = p.sub('<iframe width="' + width + '" height="' + height + '" src="https://www.youtube.com/embed/' + result[0] + '" frameborder="0" allowfullscreen></iframe>', data, 1)
             data = p.sub('<iframe width="' + width + '" height="' + height + '" src="https://www.youtube.com/embed/' + result[0] + '" frameborder="0" allowfullscreen></iframe>', data, 1)
         else:
         else:
             break
             break
-
+            
     while True:
     while True:
         m = re.search("\[\[(((?!\]\]).)*)\]\]", data)
         m = re.search("\[\[(((?!\]\]).)*)\]\]", data)
         if(m):
         if(m):

+ 10 - 10
set/set.json

@@ -1,11 +1,11 @@
-{
-	"db": "data",
-	"host": "localhost",
-	"user": "root",
-	"pw": "test",
-	"owner": "Admin",
-	"name": "Ownet",
-	"frontpage": "FrontPage",
-	"license": "CC 0",
-	"key": "test"
+{
+	"db" : "data",
+	"host" : "localhost",
+	"user" : "root",
+	"pw" : "test",
+	"owner" : "Admin",
+	"name" : "Ownet",
+	"frontpage" : "FrontPage",
+	"license" : "CC 0",
+	"key" : "test"
 }
 }