Finished port to python3. Untested.

1 files changed, 6 insertions, 4 deletions

diff --git a/pywhoisd.py b/pywhoisd.py
index 6b8a36d..4e78564 100755
--- a/pywhoisd.py
+++ b/pywhoisd.py
@@ -1,6 +1,8 @@
 #!/usr/bin/python3
 import configparser
+
 import core
+import xml
 
 class PyWhoisD():
     """Main class. It reads the configuration options and starts the server"""
@@ -22,13 +24,13 @@ class PyWhoisD():
         mode = self.config['Storage']['mode']
 
         if mode == 'xml':
-            self.data = WhoisData.WhoisDataXML(self.config)
+            self.data = xml.DataXML(self.config)
 
     def config_daemon(self):
         """Config common information source for all configured servers"""
         
         self.config_data()
-        self.daemon = WhoisDaemon(self.data)
+        self.daemon = core.Daemon(self.data)
 
     
     def web(self):
@@ -46,10 +48,10 @@ class PyWhoisD():
         """Sets up server configuration from config files"""
         
         if self.classic():
-            self.classic_server = core.WhoisClassicServer(self.config, self.daemon)
+            self.classic_server = core.ClassicServer(self.config, self.daemon)
                 
         if self.web():
-            self.web_server = core.WhoisWebServer(self.config, self.daemon)
+            self.web_server = core.WebServer(self.config, self.daemon)
 
     def start_servers(self):
         """Start configured servers"""