← Back to branch summary

~alecu/ubuntuone-client/proxy-tunnel-cookies

« back to all changes in this revision

Viewing changes to ubuntuone/proxy/tunnel_server.py

  • Committer: Alejandro J. Cura
  • Date: 2012-03-16 13:40:59 UTC
  • mfrom: (1238.1.1 proxy-tunnel-auth)
  • Revision ID: alecu@canonical.com-20120316134059-ia8d67sj8cn85p5q
Merged proxy-tunnel-auth into proxy-tunnel-cookies.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/proxy/tunnel_server.py
90
90
                                 user=settings.get("username", ""),
91
91
                                 password=settings.get("password", ""))
92
92
    logger.error("No proxy correctly configured.")
93
 
    return QNetworkProxy(QNetworkProxy.NoProxy)
 
93
    return QNetworkProxy(QNetworkProxy.DefaultProxy)
94
94
 
95
95
 
96
96
class RemoteSocket(QTcpSocket):
356
356
    else:
357
357
        query = QNetworkProxyQuery(host, port)
358
358
        proxies = QNetworkProxyFactory.systemProxyForQuery(query)
359
 
        return len(proxies) and proxies[0].type() != QNetworkProxy.NoProxy
 
359
        return len(proxies) and proxies[0].type() != QNetworkProxy.DefaultProxy
360
360
 
361
361
 
362
362
def main(argv):