← Back to branch summary

~verterok/ubuntuone-client/fix-776386

« back to all changes in this revision

Viewing changes to ubuntuone/syncdaemon/action_queue.py

  • Committer: Tarmac
  • Author(s): Facundo Batista
  • Date: 2011-09-01 18:41:44 UTC
  • mfrom: (1117.3.1 support-ssl-error)
  • Revision ID: tarmac-20110901184144-j2dw72qf0zk4ddbs
Support SSL error on initial dialog with server (LP: #833388).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/syncdaemon/action_queue.py
42
42
from urllib2 import urlopen, Request, HTTPError
43
43
from urlparse import urljoin
44
44
 
 
45
import OpenSSL.SSL
 
46
 
45
47
from zope.interface import implements
46
48
from twisted.internet import reactor, defer, threads, task
47
49
from twisted.internet import error as twisted_errors
938
940
            event = event_error
939
941
            self.event_queue.push(event_error, error=str(failure))
940
942
        except (twisted_errors.ConnectionLost,
941
 
                twisted_errors.ConnectionDone), failure:
 
943
                twisted_errors.ConnectionDone,
 
944
                OpenSSL.SSL.Error), failure:
942
945
            # connection ended, just don't do anything: the SYS_CONNECTION_ETC
943
946
            # will be sent by normal client/protocol mechanisms, and logging
944
947
            # will be done later in this function.