next series of cleanup and fixes patches

[Nicolas Sebrecht]

	Hi,

This /should/ be the last series about style, fixes and cleanups.

Sadly, I sucked at releasing a -rc1 we can test because it's broken.  So, I
intend to release -rc2 soon for the testers can happily test the new code. :-)

I hope the SSL issue to be fixed before. If not, we might bisect the offending
patch and revert it in order to not block the whole pending work. This issue
should be nothing very serious, BTW.

I've splitted the diffstat because the last patch made it a bit scary.

 offlineimap.conf                  |  2 +-
 offlineimap/emailutil.py          |  3 +--
 offlineimap/imaputil.py           | 98 +++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------
 offlineimap/init.py               |  8 ++++----
 offlineimap/repository/Maildir.py |  8 ++++----
 5 files changed, 59 insertions(+), 60 deletions(-)

[PATCH 1/6] offlineimap.conf: fix minor typo in comments
[PATCH 2/6] emailutil.py: remove unused import time
[PATCH 3/6] imaputil.py: avoid to redefine "string"
[PATCH 4/6] init.py: avoid redefining "type" builtin
[PATCH 5/6] repository/Maildir.py: use f variable instead of folder


 offlineimap/accounts.py               |   7 ++++---
 offlineimap/emailutil.py              |   5 ++---
 offlineimap/folder/Base.py            | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------
 offlineimap/folder/IMAP.py            | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------
 offlineimap/imapserver.py             | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------
 offlineimap/imaputil.py               |   9 ++++-----
 offlineimap/init.py                   |  23 ++++++++++++-----------
 offlineimap/localeval.py              |   4 +---
 offlineimap/repository/Base.py        |   1 +
 offlineimap/repository/LocalStatus.py |   9 +++++----
 offlineimap/repository/Maildir.py     |  24 +++++++++++++-----------
 offlineimap/ui/TTY.py                 |  20 ++++++++++----------
 offlineimap/ui/UIBase.py              |   8 ++++----
 offlineimap/ui/debuglock.py           |   5 +++--

[PATCH 6/6] more style consistency