Updated to new pyhp

.doreah

@@ -8,3 +8,5 @@ caching:
    folder: "cache/"
 regular:
    autostart: false
+pyhp:
+   version: 2

requirements.txt

@@ -1,6 +1,6 @@
 bottle>=0.12.16
 waitress>=1.3
-doreah>=1.1.7
+doreah>=1.2
 nimrodel>=0.4.9
 setproctitle>=1.1.10
 wand>=0.5.4

server.py

@@ -149,15 +149,8 @@ def static_html(name):
 	keys = remove_identical(FormsDict.decode(request.query))
 
 	# if a pyhp file exists, use this
-	if os.path.exists("website/" + name + ".pyhp"):
+	if os.path.exists("website/" + name + ".pyhp") and settings.get_settings("USE_PYHP"):
 		from doreah.pyhp import file
-		#try:
-		#	d = SourceFileLoader(name,"website/" + name + ".py").load_module().pyhp(keys)
-		#	print("loaded dict")
-		#except:
-		#	d = {}
-		#	print("error")
-		#	raise
 		environ = {} #things we expose to the pyhp pages
 
 		# maloja

settings/default.ini

@@ -56,3 +56,4 @@ NAME = "Generic Maloja User"
 [Misc]
 
 EXPERIMENTAL_FEATURES = no
+USE_PYHP = no