From 17f60f7233b32860e3c79b30adf8d6a36daa52c9 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Fri, 6 Jan 2012 23:13:55 +0100 Subject: [PATCH] Remove from __future__ import with_statements These were needed for python <2.6 compatability, but since we depend on python 2.6 now, these can go. Signed-off-by: Sebastian Spaeth --- offlineimap/folder/UIDMaps.py | 4 +--- offlineimap/imapserver.py | 1 - offlineimap/ui/Curses.py | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/offlineimap/folder/UIDMaps.py b/offlineimap/folder/UIDMaps.py index 6b361f2..1a6283c 100644 --- a/offlineimap/folder/UIDMaps.py +++ b/offlineimap/folder/UIDMaps.py @@ -1,6 +1,5 @@ # Base folder support -# Copyright (C) 2002 John Goerzen -# +# Copyright (C) 2002-2012 John Goerzen & contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from __future__ import with_statement # needed for python 2.5 from threading import Lock from IMAP import IMAPFolder import os.path diff --git a/offlineimap/imapserver.py b/offlineimap/imapserver.py index 0106782..a355eaf 100644 --- a/offlineimap/imapserver.py +++ b/offlineimap/imapserver.py @@ -15,7 +15,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from __future__ import with_statement # needed for python 2.5 from offlineimap import imaplibutil, imaputil, threadutil, OfflineImapError from offlineimap.ui import getglobalui from threading import Lock, BoundedSemaphore, Thread, Event, currentThread diff --git a/offlineimap/ui/Curses.py b/offlineimap/ui/Curses.py index f1626c4..9a2b97f 100644 --- a/offlineimap/ui/Curses.py +++ b/offlineimap/ui/Curses.py @@ -15,7 +15,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from __future__ import with_statement # needed for python 2.5 from threading import RLock, currentThread, Lock, Event from thread import get_ident # python < 2.6 support from collections import deque