From b37343bad9dbb3e9dee20979fe05c89a88d240f3 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Thu, 23 Feb 2006 16:52:32 +0000 Subject: [PATCH] - fixed tools.py to explain why crypt is not available - removed old xmlrpcservertest.py git-svn-id: file:///home/www/usr01/svn/gnuviechadmin/gnuviech.info/gnuviechadmin/trunk@169 a67ec6bc-e5d5-0310-a910-815c51eb3124 --- backend/gnuviech/tools.py | 7 ++++++- backend/mailtools.py | 2 +- backend/xmlrpcservertest.py | 26 -------------------------- 3 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 backend/xmlrpcservertest.py diff --git a/backend/gnuviech/tools.py b/backend/gnuviech/tools.py index b42e317..ac8c247 100644 --- a/backend/gnuviech/tools.py +++ b/backend/gnuviech/tools.py @@ -5,7 +5,12 @@ import random, re from gnuviech import GNVPrefs -from crypt import crypt +try: + from crypt import crypt +except ImportError, ie: + import sys + sys.__stderr__.write("Unsupported platform without crypt: " + sys.platform) + sys.exit() from time import time def generatePassword(): diff --git a/backend/mailtools.py b/backend/mailtools.py index 2bb079b..1107e9f 100755 --- a/backend/mailtools.py +++ b/backend/mailtools.py @@ -130,6 +130,6 @@ class POP3Account(MailAccount): if __name__ == "__main__": prefs = GNVPrefs() - domain = GNVDomain("dittberner.info", prefs) + domain = GNVDomain("test.local", prefs) domain.addPOP3Account(POP3Account(domain, "test")) domain.addMailAlias(MailAlias(domain, "klaus", "klaus@test.de")) diff --git a/backend/xmlrpcservertest.py b/backend/xmlrpcservertest.py deleted file mode 100644 index 8cb8fb2..0000000 --- a/backend/xmlrpcservertest.py +++ /dev/null @@ -1,26 +0,0 @@ -from DocXMLRPCServer import DocXMLRPCServer -import traceback -import pwd - -class TestService: - def listUsers(self): - """Lists all system users.""" - entries = [":".join((item[0], str(item[2]), str(item[3]), item[4])) for item in pwd.getpwall() if item[0].find("usr")==0] - - return "\n".join(entries) - -def startRPCServer(): - server = DocXMLRPCServer(("localhost", 8080)) - server.register_introspection_functions() - server.register_instance(TestService()) - - try: - server.serve_forever() - except KeyboardInterrupt: - server.server_close() - -if __name__ == "__main__": - service = TestService() - print service.listUsers() - - startRPCServer()