tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ns/keep-2.5-compatibility' into next

Browse Source 
Conflicts:
	Changelog.draft.rst
This commit is contained in:
Nicolas Sebrecht 2011-02-21 11:47:42 +01:00
commit 35b0b5bf84
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.draft.rst
View File

@ -21,6 +21,7 @@ Bug Fixes
* Fix craches for getglobalui(). * Fix craches for getglobalui().
* Fix documentation build. * Fix documentation build.
* Restore compatibiliy with python 2.5.
Pending for the next major release Pending for the next major release

5
offlineimap/ui/TTY.py
View File

@ -37,7 +37,10 @@ class TTYUI(UIBase):
#if the next output comes from a different thread than our last one #if the next output comes from a different thread than our last one
#add the info. #add the info.
#Most look like 'account sync foo' or 'Folder sync foo'. #Most look like 'account sync foo' or 'Folder sync foo'.
threadname = currentThread().name try:
threadname = currentThread().name
except AttributeError:
threadname = currentThread().getName()
if (threadname == s._lastThreaddisplay): if (threadname == s._lastThreaddisplay):
print " %s" % msg print " %s" % msg
else: else: