← Back to branch summary

~nataliabidart/magicicada-protocol/update-copyright-headers

« back to all changes in this revision

Viewing changes to ubuntuone/storageprotocol/client.py

  • Committer: Magicicada Bot
  • Author(s): Facundo Batista
  • Date: 2016-09-28 13:26:24 UTC
  • mfrom: (166.1.2 xenial-tests)
  • Revision ID: magicicada_bot-20160928132624-t0kcfkr5kc6r0zs2
[r=nataliabidart] Small changes for tests to run ok under xenial.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/storageprotocol/client.py
1689
1689
        """
1690
1690
        delayed_call = getattr(self, call_id)
1691
1691
        # check if we already have a DelayedCall running
1692
 
        if delayed_call is None or (not delayed_call.active()
1693
 
                                    and delayed_call.cancelled):
 
1692
        if delayed_call is None or (
 
1693
                not delayed_call.active() and delayed_call.cancelled):
1694
1694
            return self.callLater(period, func)
1695
1695
        return delayed_call
1696
1696
 
1837
1837
    reactor.connectTCP('localhost', 20100, StorageClientFactory())
1838
1838
 
1839
1839
    # using ssl
1840
 
    #reactor.connectSSL('localhost', 20101, StorageClientFactory(),
 
1840
    # reactor.connectSSL('localhost', 20101, StorageClientFactory(),
1841
1841
    #           ssl.ClientContextFactory())
1842
1842
 
1843
1843
    # using ssl over a proxy
1844
 
    #from ubuntuone.storageprotocol import proxy_tunnel
1845
 
    #proxy_tunnel.connectHTTPS('localhost', 3128,
 
1844
    # from ubuntuone.storageprotocol import proxy_tunnel
 
1845
    # proxy_tunnel.connectHTTPS('localhost', 3128,
1846
1846
    #        'localhost', 20101, StorageClientFactory(),
1847
1847
    #        user="test", passwd="test")
1848
1848