← Back to branch summary

~ubuntu-branches/ubuntu/saucy/ubuntuone-client/saucy-proposed

« back to all changes in this revision

Viewing changes to ubuntuone/proxy/tunnel_server.py

  • Committer: Package Import Robot
  • Author(s): Rodney Dawes
  • Date: 2013-01-29 15:22:08 UTC
  • mfrom: (1.1.78)
  • Revision ID: package-import@ubuntu.com-20130129152208-btdghfcy2ua0mrb4
Tags: 4.1.90-0ubuntu1
https://launchpad.net/bugs/1101271
https://launchpad.net/bugs/1093111
https://launchpad.net/bugs/1108036
https://launchpad.net/bugs/1100926
https://launchpad.net/bugs/1029094
https://launchpad.net/bugs/997326
* New upstream release.
  - Fix support for searching local files in cloud folders. (LP: #1101271)
  - Various fixes to the test suite.
  - Fix tritcask DataFile.write to flush with new libc6. (LP: #1093111)
  - Remove most of the static glib bindings usage. (LP: #1108036)
  - Avoid g_type_init with new versions of glib. (LP: #1100926)
  - Replace simplejson usage with json. (LP: #1029094)
  - Use a standard LC_CTYPE locale when the LANG is turkish. (LP: #997326)
* debian/control:
  - Require newer version of ubuntu-sso-client for LANG fix.
  - Update dependencies to drop fallbacks for static bindings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/proxy/tunnel_server.py
1
1
# -*- coding: utf-8 -*-
2
2
#
3
 
# Copyright 2012 Canonical Ltd.
 
3
# Copyright 2012-2013 Canonical Ltd.
4
4
#
5
5
# This program is free software: you can redistribute it and/or modify it
6
6
# under the terms of the GNU General Public License version 3, as published
59
59
from zope.interface import implements
60
60
 
61
61
from ubuntu_sso.keyring import Keyring
 
62
from ubuntu_sso.utils.locale import fix_turkish_locale
62
63
from ubuntu_sso.utils.webclient import gsettings
63
64
from ubuntuone.proxy.common import (
64
65
    BaseTunnelProtocol,
380
381
 
381
382
def main(argv):
382
383
    """The main function for the tunnel server."""
 
384
    fix_turkish_locale()
383
385
    if not check_proxy_enabled(*argv[1:]):
384
386
        sys.stdout.write("Proxy not enabled.")
385
387
        sys.stdout.flush()