Merge branch 'master' of https://github.com/theotherp/nzbhydra

Author: theotherp@gmx.de

nzbhydra/downloader.py

@@ -58,7 +58,9 @@ def get_rpc(self, host=None, ssl=None, port=None, username=None, password=None):
         f.scheme = "https" if ssl else "http"
         f.port = port
         if username is not None and password is not None:
-            f.path.add("%s:%s" % (username, password))
+            #f.path.add("%s:%s" % (username, password))
+            f.username = username
+            f.password = password
         f.path.add("xmlrpc")
 
         return xmlrpc.client.ServerProxy(f.tostr())
@@ -291,4 +293,4 @@ def getInstanceBySetting(setting):
         return Nzbget(setting)
     raise DownloaderNotFoundException("No downloader with type %s found" % setting.type)
 
-    
+