changeset 1690:6fe30ca971e7

use same attr names for wikiconfig and mailimportconf, so one could just import mailimportconf from wikiconfig
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 02 Dec 2006 13:31:38 +0100
parents 7b80735ede14
children d29448b5771d
files MoinMoin/script/xmlrpc/mailimport.py wiki/config/mailimportconf.py
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/script/xmlrpc/mailimport.py	Sun Nov 26 22:23:25 2006 +0100
+++ b/MoinMoin/script/xmlrpc/mailimport.py	Sat Dec 02 13:31:38 2006 +0100
@@ -27,8 +27,8 @@
         except ImportError:
             fatal("Could not find the file mailimportconf.py. Maybe you want to use the config param?")
 
-        secret = mailimportconf.mailimport_secret
-        url = mailimportconf.mailimport_url
+        secret = mailimportconf.mail_import_secret
+        url = mailimportconf.mail_import_url
 
         s = xmlrpclib.ServerProxy(url)
 
--- a/wiki/config/mailimportconf.py	Sun Nov 26 22:23:25 2006 +0100
+++ b/wiki/config/mailimportconf.py	Sat Dec 02 13:31:38 2006 +0100
@@ -1,7 +1,8 @@
 # This is the configuration file for the mail import client
 
 # This secret has to be known by the wiki server
-mailimport_secret = u"foo"
+mail_import_secret = u"foo"
 
 # The target wiki URL 
-mailimport_url = u"http://localhost/?action=xmlrpc2"
+mail_import_url = u"http://localhost/?action=xmlrpc2"
+