← Back to branch summary

~facundo/magicicada-client/changes-for-xenial

« back to all changes in this revision

Viewing changes to ubuntuone/proxy/tunnel_server.py

  • Committer: Magicicada Bot
  • Author(s): Natalia
  • Date: 2016-05-30 15:43:30 UTC
  • mfrom: (1418.1.21 no-sso-client)
  • Revision ID: magicicada_bot-20160530154330-b4his4s3wlucu7zv
[r=facundo] - Decouple client code from ubuntu-sso-client code. Copied and made an initial cleanup on the networkstate, utils and keyring modules.
- Removed completely dependencies with oauthlibs.
- Moved tests/ folder to inside ubuntuone/ proper folders.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/proxy/tunnel_server.py
58
58
from twisted.internet import defer, interfaces
59
59
from zope.interface import implements
60
60
 
61
 
from ubuntu_sso.keyring import Keyring
 
61
from ubuntuone.clientdefs import NAME
 
62
from ubuntuone.keyring import Keyring
62
63
try:
63
 
    from ubuntu_sso.utils.locale import fix_turkish_locale
 
64
    from ubuntuone.utils.locale import fix_turkish_locale
64
65
except ImportError:
65
66
    fix_turkish_locale = lambda: None
66
 
from ubuntu_sso.utils.webclient import gsettings
 
67
from ubuntuone.utils.webclient import gsettings
67
68
from ubuntuone.proxy.common import (
68
69
    BaseTunnelProtocol,
69
70
    CRLF,
272
273
                logger.info("Connected with keyring credentials")
273
274
 
274
275
            response_headers = {
275
 
                "Server": "Magicicada proxy tunnel",
 
276
                "Server": "%s proxy tunnel" % NAME,
276
277
            }
277
278
            self.write_transport("HTTP/1.0 200 Proxy connection established" +
278
279
                                 CRLF + self.format_headers(response_headers) +