diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-05-29 10:25:32 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-05-29 10:25:32 -0300 |
| commit | 9a5a325831230687a7da4ad5300c99f03aebba72 (patch) | |
| tree | 6569fff23c2c553b55f624e9db1744b6cf943330 /src/leap/mail/imap/server.py | |
| parent | e5fa0790f5231c333aba4bc5f6766556e062aa6c (diff) | |
| parent | efed933415a2f6dead78dd6deca0f2383c889f3f (diff) | |
Merge remote-tracking branch 'kali/bug/imap-service-use-defer-to-thread' into develop
Diffstat (limited to 'src/leap/mail/imap/server.py')
| -rw-r--r-- | src/leap/mail/imap/server.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/leap/mail/imap/server.py b/src/leap/mail/imap/server.py index 30938db..45c43b7 100644 --- a/src/leap/mail/imap/server.py +++ b/src/leap/mail/imap/server.py @@ -814,8 +814,11 @@ class MessageCollection(WithMsgFields): leap_assert(isinstance(mbox, (str, unicode)), "mbox needs to be a string") leap_assert(soledad, "Need a soledad instance to initialize") - leap_assert(isinstance(soledad._db, SQLCipherDatabase), - "soledad._db must be an instance of SQLCipherDatabase") + + # This is a wrapper now!... + # should move assertion there... + #leap_assert(isinstance(soledad._db, SQLCipherDatabase), + #"soledad._db must be an instance of SQLCipherDatabase") # okay, all in order, keep going... @@ -1080,8 +1083,10 @@ class SoledadMailbox(WithMsgFields): """ leap_assert(mbox, "Need a mailbox name to initialize") leap_assert(soledad, "Need a soledad instance to initialize") - leap_assert(isinstance(soledad._db, SQLCipherDatabase), - "soledad._db must be an instance of SQLCipherDatabase") + + # XXX should move to wrapper + #leap_assert(isinstance(soledad._db, SQLCipherDatabase), + #"soledad._db must be an instance of SQLCipherDatabase") self.mbox = mbox self.rw = rw |