Merge branch 'ns/keep-2.5-compatibility' into next
Conflicts: Changelog.draft.rst
This commit is contained in:
commit
35b0b5bf84
@ -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
|
||||||
|
@ -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'.
|
||||||
|
try:
|
||||||
threadname = currentThread().name
|
threadname = currentThread().name
|
||||||
|
except AttributeError:
|
||||||
|
threadname = currentThread().getName()
|
||||||
if (threadname == s._lastThreaddisplay):
|
if (threadname == s._lastThreaddisplay):
|
||||||
print " %s" % msg
|
print " %s" % msg
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user