From ce8c817aca94500ec1b874edbb98c5d5f5f28214 Mon Sep 17 00:00:00 2001 From: Daniel STAN Date: Sun, 12 Feb 2012 23:30:13 +0100 Subject: [PATCH] =?UTF-8?q?[intranet|squeeze]=20On=20enl=C3=A8ve=20le=20d?= =?UTF-8?q?=C3=A9pr=C3=A9ci=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ignore-this: d0485c9ec2225694207cef0b5b733a08 darcs-hash:20120212223013-28565-3bd4cb29bcee856ac8ab038d7b4e672e73f19914.gz --- intranet/ClassesIntranet/Intranet.py | 9 +++++---- intranet/templates/accueil.tmpl | 1 + intranet/templates/error.tmpl | 1 + intranet/templates/error403.tmpl | 1 + intranet/templates/login.tmpl | 1 + intranet/templates/main.tmpl | 1 + 6 files changed, 10 insertions(+), 4 deletions(-) diff --git a/intranet/ClassesIntranet/Intranet.py b/intranet/ClassesIntranet/Intranet.py index 650c17e8..37acdc01 100644 --- a/intranet/ClassesIntranet/Intranet.py +++ b/intranet/ClassesIntranet/Intranet.py @@ -30,6 +30,7 @@ make_path = os.path.join import crans.utils.exceptions from ClassesIntranet.AuthorisationsManager import setDroits from crans.mail import quickSend +import imp class Intranet: # ######################################################## # @@ -48,10 +49,10 @@ class Intranet: # faire ici l'importation # importer le fichier main.py try: - #module_path = MODULES_DIR + un_module + "/main" - module_path = make_path(un_module, "main") - # import n'aime pas les chemins absolus !! - mon_module = __import__(module_path) + #module_path = MODULES_DIR + un_module + module_path = make_path(MODULES_DIR,un_module) + f, filename, desc = imp.find_module('main', [module_path]) + mon_module = imp.load_module('main', f, filename, desc) module_root = mon_module.main() # on ajoute la classe a l'arborescence de cherrypy : setattr( self, un_module, module_root) diff --git a/intranet/templates/accueil.tmpl b/intranet/templates/accueil.tmpl index 2ee957c0..eac35ea8 100644 --- a/intranet/templates/accueil.tmpl +++ b/intranet/templates/accueil.tmpl @@ -1,3 +1,4 @@ +#encoding:utf-8
#for a_category in $modules
diff --git a/intranet/templates/error.tmpl b/intranet/templates/error.tmpl index ef080209..aae48d73 100644 --- a/intranet/templates/error.tmpl +++ b/intranet/templates/error.tmpl @@ -1,3 +1,4 @@ +#encoding:utf-8 Traveaux
diff --git a/intranet/templates/error403.tmpl b/intranet/templates/error403.tmpl index d1fa712c..29b07e7d 100644 --- a/intranet/templates/error403.tmpl +++ b/intranet/templates/error403.tmpl @@ -1,3 +1,4 @@ +#encoding:utf-8 Do Not Enter
diff --git a/intranet/templates/login.tmpl b/intranet/templates/login.tmpl index d96de7dc..3b639e2c 100644 --- a/intranet/templates/login.tmpl +++ b/intranet/templates/login.tmpl @@ -1,3 +1,4 @@ +#encoding:utf-8 diff --git a/intranet/templates/main.tmpl b/intranet/templates/main.tmpl index f32578c6..324aa635 100644 --- a/intranet/templates/main.tmpl +++ b/intranet/templates/main.tmpl @@ -1,4 +1,5 @@ #import cherrypy +#encoding:utf-8 #set bugMail = cherrypy.config.get("mail.bugreport", "nounous@crans.org")