Merge branch 'ss/folder/base_clean-threadutil-import' into next
Conflicts: offlineimap/folder/Base.py
This commit is contained in:
commit
3446aa9368
@ -18,8 +18,6 @@
|
||||
|
||||
from threading import *
|
||||
from offlineimap import threadutil
|
||||
from offlineimap.threadutil import InstanceLimitedThread
|
||||
from offlineimap.ui import getglobalui
|
||||
import os.path
|
||||
import re
|
||||
import sys
|
||||
@ -250,7 +248,7 @@ class BaseFolder:
|
||||
for uid in uidlist:
|
||||
if usethread and usethread.suggeststhreads():
|
||||
usethread.waitforthread()
|
||||
thread = InstanceLimitedThread(\
|
||||
thread = threadutil.InstanceLimitedThread(\
|
||||
usethread.getcopyinstancelimit(),
|
||||
target = self.syncmessagesto_neguid_msg,
|
||||
name = "New msg sync from %s" % self.getvisiblename(),
|
||||
@ -309,7 +307,7 @@ class BaseFolder:
|
||||
if not uid in dest_messagelist:
|
||||
if self.suggeststhreads():
|
||||
self.waitforthread()
|
||||
thread = InstanceLimitedThread(\
|
||||
thread = threadutil.InstanceLimitedThread(\
|
||||
self.getcopyinstancelimit(),
|
||||
target = self.copymessageto,
|
||||
name = "Copy message %d from %s" % (uid,
|
||||
|
Loading…
Reference in New Issue
Block a user