rabin před 7 roky
rodič
revize
a0bdd045da

+ 1 - 1
demeter/admin/page/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 from demeter.web import *
-Web.init(__file__)
+Web.init(__file__, globals())

+ 3 - 3
demeter/web.py

@@ -219,13 +219,13 @@ class Web(object):
 		return callback
 
 	@classmethod
-	def init(self, file):
+	def init(self, file, gbs):
 		path = os.path.split(os.path.realpath(file))[0] + '/'
 		sys.path.append(path)
 		files = self.file(path)
 		url = []
 		for key in files:
-			module = __import__(key)
+			module = __import__(key, gbs)
 			url = self.url(module, key, url)
 		Demeter.route = Demeter.route + url
 
@@ -238,7 +238,7 @@ class Web(object):
 		files = os.listdir(path)
 		result = []
 		for key in files:
-			if '.DS_Store' not in key and  '__' not in key and 'pyc' not in key:
+			if key and '.DS_Store' not in key and  '__' not in key and 'pyc' not in key:
 				key = key.replace('.py', '')
 				result.append(key)
 		return result

+ 1 - 1
demos/helloworld/admin/page/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 from demeter.web import *
-Web.init(__file__)
+Web.init(__file__, globals())

+ 1 - 1
demos/helloworld/front/page/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 from demeter.web import *
-Web.init(__file__)
+Web.init(__file__, globals())