@@ -12,11 +12,11 @@
 # simulating requests too. Hooks into mains gtk.statusbar().
 # And can normalize URLs to always carry a trailing slash
 # after the domain name.
 
 
-from config import conf, __print__, dbg
+from config import *
 import requests
 
 
 #-- hooks to progress meter and status bar in main window
 feedback = None
@@ -52,11 +52,11 @@
 #-- Retrieve data via HTTP
 #
 #  Well, it says "get", but it actually does POST and AJAXish GET requests too.
 #
 def get(url, params={}, referer="", post=0, ajax=0, binary=0, feedback=None, content=True):
-    __print__( dbg.HTTP, "GET", url, params )
+    log.HTTP("GET", url, params )
 
     # statusbar info
     progress_feedback(url)
     
     # combine headers
@@ -74,19 +74,19 @@
     if post:
         r = session.post(url, params=params, headers=headers, timeout=7.5)
     else:    
         r = session.get(url, params=params, headers=headers, timeout=9.75)
 
-    __print__( dbg.HTTP, r.request.headers );
-    __print__( dbg.HTTP, r.headers );
+    log.HTTP(r.request.headers );
+    log.HTTP(r.headers );
             
     # finish, clean statusbar
     #progress_feedback(0.9)
     #progress_feedback("")
 
     # result
-    __print__( dbg.INFO, "Content-Length", len(r.content) )
+    log.INFO("Content-Length", len(r.content) )
     if not content:
         return r
     elif binary:
         return r.content
     else: