Move xmlparser to tools

bot.py

@@ -26,7 +26,7 @@ import threading
 import time
 import uuid
 
-__version__ = '3.4.dev2'
+__version__ = '3.4.dev3'
 __author__  = 'nemunaire'
 
 from consumer import Consumer, EventConsumer, MessageConsumer
@@ -504,8 +504,3 @@ def reload():
     imp.reload(tools)
 
     tools.reload()
-
-    import xmlparser
-    imp.reload(xmlparser)
-    import xmlparser.node
-    imp.reload(xmlparser.node)

importer.py

@@ -29,7 +29,7 @@ import event
 import exception
 import hooks
 from message import TextMessage
-import xmlparser
+from tools.xmlparser import parse_file, module_state
 
 logger = logging.getLogger("nemubot.importer")
 
@@ -191,7 +191,7 @@ class ModuleLoader(SourceLoader):
         module.del_event = del_event
 
         if not hasattr(module, "NODATA"):
-            module.DATAS = xmlparser.parse_file(self.context.data_path
+            module.DATAS = parse_file(self.context.data_path
                                                 + module.__name__ + ".xml")
             module.save = mod_save
         else:
@@ -200,7 +200,7 @@ class ModuleLoader(SourceLoader):
         module.CONF = self.config
 
         module.ModuleEvent = event.ModuleEvent
-        module.ModuleState = xmlparser.module_state.ModuleState
+        module.ModuleState = module_state.ModuleState
         module.IRCException = exception.IRCException
 
         # Load dependancies

modules/birthday.py

@@ -9,7 +9,7 @@ from datetime import date, datetime
 from hooks import hook
 from tools.countdown import countdown_format
 from tools.date import extractDate
-from xmlparser.node import ModuleState
+from tools.xmlparser.node import ModuleState
 
 nemubotversion = 3.4
 

modules/ddg/DDGSearch.py

@@ -3,15 +3,15 @@
 from urllib.parse import quote
 from urllib.request import urlopen
 
-import xmlparser
 from tools import web
+from tools.xmlparser import parse_string
 
 class DDGSearch:
     def __init__(self, terms):
         self.terms = terms
 
         raw = urlopen("https://api.duckduckgo.com/?q=%s&format=xml&no_redirect=1" % quote(terms), timeout=10)
-        self.ddgres = xmlparser.parse_string(raw.read())
+        self.ddgres = parse_string(raw.read())
 
     @property
     def type(self):

modules/ddg/WFASearch.py

@@ -3,7 +3,7 @@
 from urllib.parse import quote
 from urllib.request import urlopen
 
-import xmlparser
+from tools.xmlparser import parse_string
 
 class WFASearch:
     def __init__(self, terms):
@@ -13,7 +13,7 @@ class WFASearch:
                                      "input=%s&appid=%s"
                                      % (quote(terms),
                                     CONF.getNode("wfaapi")["key"]), timeout=15)
-            self.wfares = xmlparser.parse_string(raw.read())
+            self.wfares = parse_string(raw.read())
         except (TypeError, KeyError):
             print ("You need a Wolfram|Alpha API key in order to use this "
                    "module. Add it to the module configuration file:\n<wfaapi"

modules/translate.py

@@ -13,7 +13,6 @@ nemubotversion = 3.4
 
 from more import Response
 
-import xmlparser
 
 LANG = ["ar", "zh", "cz", "en", "fr", "gr", "it",
         "ja", "ko", "pl", "pt", "ro", "es", "tr"]

tools/__init__.py

@@ -44,3 +44,8 @@ def reload():
 
     import tools.web
     imp.reload(tools.web)
+
+    import tools.xmlparser
+    imp.reload(tools.xmlparser)
+    import tools.xmlparser.node
+    imp.reload(tools.xmlparser.node)

tools/config.py

@@ -19,7 +19,7 @@
 import logging
 import os
 
-import xmlparser
+from tools.xmlparser import parse_file
 
 logger = logging.getLogger("nemubot.tools.config")
 
@@ -98,7 +98,7 @@ def load_file(filename, context):
     """
 
     if os.path.isfile(filename):
-        config = xmlparser.parse_file(filename)
+        config = parse_file(filename)
 
         # This is a true nemubot configuration file, load it!
         if config.getName() == "nemubotconfig":

tools/web.py

@@ -26,7 +26,7 @@ from urllib.parse import urlparse
 from urllib.request import urlopen
 
 from exception import IRCException
-import xmlparser
+from tools.xmlparser import parse_string
 
 
 def isURL(url):
@@ -141,7 +141,7 @@ def getXML(url, timeout=15):
     if cnt is None:
         return None
     else:
-        return xmlparser.parse_string(cnt.encode())
+        return parse_string(cnt.encode())
 
 
 def getJSON(url, timeout=15):

tools/xmlparser/__init__.py

@@ -16,14 +16,12 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
-import imp
 import logging
 import xml.sax
 
 from . import node as module_state
 
-logger = logging.getLogger("nemubot.xmlparser")
+logger = logging.getLogger("nemubot.tools.xmlparser")
 
 
 class ModuleStatesFile(xml.sax.ContentHandler):

tools/xmlparser/node.py

@@ -3,11 +3,9 @@
 import xml.sax
 from datetime import datetime, timezone
 import logging
-import sys
 import time
-import traceback
 
-logger = logging.getLogger("nemubot.xmlparser.node")
+logger = logging.getLogger("nemubot.tools.xmlparser.node")
 
 
 class ModuleState: