Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-08-07 09:01:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Store: Fix issue with using proxy when an arument is None.

Browse Source
This commit is contained in:
John Schember 2011-04-18 18:57:28 -04:00
parent b6f44d0b7c
commit 234248cd23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/store/web_control.py
View File

@ -31,10 +31,14 @@ class NPWebView(QWebView):
proxy_parts = urlparse(http_proxy) proxy_parts = urlparse(http_proxy)
proxy = QNetworkProxy() proxy = QNetworkProxy()
proxy.setType(QNetworkProxy.HttpProxy) proxy.setType(QNetworkProxy.HttpProxy)
proxy.setUser(proxy_parts.username) if proxy_parts.username:
proxy.setPassword(proxy_parts.password) proxy.setUser(proxy_parts.username)
proxy.setHostName(proxy_parts.hostname) if proxy_parts.password:
proxy.setPort(proxy_parts.port) proxy.setPassword(proxy_parts.password)
if proxy_parts.hostname:
proxy.setHostName(proxy_parts.hostname)
if proxy_parts.port:
proxy.setPort(proxy_parts.port)
self.page().networkAccessManager().setProxy(proxy) self.page().networkAccessManager().setProxy(proxy)
self.page().setForwardUnsupportedContent(True) self.page().setForwardUnsupportedContent(True)