further bugfixing in parsers & clean up formatting.py

diff --git a/logparse/util.py b/logparse/util.py
index 176903336a9e51b685fff9d7ff582b4e4bdc1c73..1a1cca5682bcef4068b36248a04d5c3eea4c3ab8 100644 (file)
--- a/logparse/util.py
+++ b/logparse/util.py
@@ -12,9 +12,10 @@ import inspect
 import logging
 logger = logging.getLogger(__name__)
 
-from .config import prefs
 from pkg_resources import Requirement, resource_filename
 
+from . import config
+
 def hostname(path): # get the hostname of current server
     hnfile = open(path, 'r')
     hn = re.search('^(\w*)\n*', hnfile.read()).group(1)
@@ -37,7 +38,7 @@ def resolve(ip, fqdn = 'host-only'):        # try to resolve an ip to hostname
     # resolve-domains defined in individual sections of the config take priority over global config
     
     if not fqdn:
-        fqdn = prefs['resolve-domains']
+        fqdn = config.prefs['resolve-domains']
 
     if fqdn == 'ip':
         return(ip)