summaryrefslogtreecommitdiff
path: root/alot
diff options
context:
space:
mode:
authorLucas Hoffmann <l-m-h@web.de>2018-06-19 14:43:35 +0200
committerLucas Hoffmann <l-m-h@web.de>2018-06-19 14:48:54 +0200
commitbb6f52d23f26a163a9c4fc49ee4fe749b9e3af7c (patch)
tree94265330079fdf22419fc34941431ed2f0f13d1f /alot
parentf52c43cbcc06a426d29da122b7682ba69c38c22e (diff)
Remove old __future__ imports
They are not needed for python >= 3.0.
Diffstat (limited to 'alot')
-rw-r--r--alot/__main__.py2
-rw-r--r--alot/account.py2
-rw-r--r--alot/addressbook/__init__.py2
-rw-r--r--alot/addressbook/abook.py2
-rw-r--r--alot/addressbook/external.py2
-rw-r--r--alot/buffers.py2
-rw-r--r--alot/commands/__init__.py2
-rw-r--r--alot/commands/bufferlist.py2
-rw-r--r--alot/commands/envelope.py2
-rw-r--r--alot/commands/globals.py3
-rw-r--r--alot/commands/search.py2
-rw-r--r--alot/commands/taglist.py2
-rw-r--r--alot/commands/thread.py2
-rw-r--r--alot/commands/utils.py2
-rw-r--r--alot/completion.py2
-rw-r--r--alot/crypto.py2
-rw-r--r--alot/db/__init__.py3
-rw-r--r--alot/db/attachment.py2
-rw-r--r--alot/db/envelope.py2
-rw-r--r--alot/db/manager.py2
-rw-r--r--alot/db/message.py2
-rw-r--r--alot/db/thread.py2
-rw-r--r--alot/db/utils.py2
-rw-r--r--alot/helper.py3
-rw-r--r--alot/settings/const.py2
-rw-r--r--alot/settings/manager.py2
-rw-r--r--alot/settings/theme.py2
-rw-r--r--alot/settings/utils.py2
-rw-r--r--alot/ui.py2
-rw-r--r--alot/utils/argparse.py2
-rw-r--r--alot/utils/configobj.py2
-rw-r--r--alot/walker.py2
-rw-r--r--alot/widgets/bufferlist.py2
-rw-r--r--alot/widgets/globals.py2
-rw-r--r--alot/widgets/search.py2
-rw-r--r--alot/widgets/thread.py2
-rw-r--r--alot/widgets/utils.py2
37 files changed, 0 insertions, 77 deletions
diff --git a/alot/__main__.py b/alot/__main__.py
index d8ab5b0d..b46985cb 100644
--- a/alot/__main__.py
+++ b/alot/__main__.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import argparse
import logging
import os
diff --git a/alot/account.py b/alot/account.py
index fe304ac6..f080fc88 100644
--- a/alot/account.py
+++ b/alot/account.py
@@ -3,8 +3,6 @@
# Copyright © 2017 Dylan Baker
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import abc
import glob
import logging
diff --git a/alot/addressbook/__init__.py b/alot/addressbook/__init__.py
index 28c4ecc7..cd302218 100644
--- a/alot/addressbook/__init__.py
+++ b/alot/addressbook/__init__.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2015 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import re
import abc
diff --git a/alot/addressbook/abook.py b/alot/addressbook/abook.py
index 41b5103e..6e2aa756 100644
--- a/alot/addressbook/abook.py
+++ b/alot/addressbook/abook.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2015 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import os
from . import AddressBook
from ..settings.utils import read_config
diff --git a/alot/addressbook/external.py b/alot/addressbook/external.py
index 53f1e464..93e76784 100644
--- a/alot/addressbook/external.py
+++ b/alot/addressbook/external.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2015 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import re
from ..helper import call_cmd
diff --git a/alot/buffers.py b/alot/buffers.py
index bfff3897..4f0a7044 100644
--- a/alot/buffers.py
+++ b/alot/buffers.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import logging
import os
diff --git a/alot/commands/__init__.py b/alot/commands/__init__.py
index 0887a76a..ddd7ed17 100644
--- a/alot/commands/__init__.py
+++ b/alot/commands/__init__.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import argparse
import glob
import logging
diff --git a/alot/commands/bufferlist.py b/alot/commands/bufferlist.py
index 1a9bbdeb..73bd12a4 100644
--- a/alot/commands/bufferlist.py
+++ b/alot/commands/bufferlist.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
from ..commands import Command, registerCommand
from . import globals
diff --git a/alot/commands/envelope.py b/alot/commands/envelope.py
index 0485aa00..cbff2808 100644
--- a/alot/commands/envelope.py
+++ b/alot/commands/envelope.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import argparse
import datetime
import email
diff --git a/alot/commands/globals.py b/alot/commands/globals.py
index 4e272b8e..906117a6 100644
--- a/alot/commands/globals.py
+++ b/alot/commands/globals.py
@@ -1,9 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-from __future__ import division
-
import argparse
import code
import email
diff --git a/alot/commands/search.py b/alot/commands/search.py
index bf8b9b6b..946749ec 100644
--- a/alot/commands/search.py
+++ b/alot/commands/search.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import argparse
import logging
diff --git a/alot/commands/taglist.py b/alot/commands/taglist.py
index 5f90519f..1fa01369 100644
--- a/alot/commands/taglist.py
+++ b/alot/commands/taglist.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
from . import Command, registerCommand
from .globals import SearchCommand
diff --git a/alot/commands/thread.py b/alot/commands/thread.py
index bb90a5d8..05f73d6a 100644
--- a/alot/commands/thread.py
+++ b/alot/commands/thread.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import argparse
import logging
import mailcap
diff --git a/alot/commands/utils.py b/alot/commands/utils.py
index 7a1c0ac1..2e6b64e6 100644
--- a/alot/commands/utils.py
+++ b/alot/commands/utils.py
@@ -1,8 +1,6 @@
# Copyright (C) 2015 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import re
import logging
diff --git a/alot/completion.py b/alot/completion.py
index e338ee0b..a14c2ae0 100644
--- a/alot/completion.py
+++ b/alot/completion.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import abc
import argparse
import email.utils
diff --git a/alot/crypto.py b/alot/crypto.py
index e7e0bd36..a05db2fc 100644
--- a/alot/crypto.py
+++ b/alot/crypto.py
@@ -2,8 +2,6 @@
# Copyright © 2017-2018 Dylan Baker <dylan@pnwbakers.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import gpg
from .errors import GPGProblem, GPGCode
diff --git a/alot/db/__init__.py b/alot/db/__init__.py
index 37da86e6..2c6fd634 100644
--- a/alot/db/__init__.py
+++ b/alot/db/__init__.py
@@ -1,9 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-
-from __future__ import absolute_import
-
from .thread import Thread
from .message import Message
DB_ENC = 'UTF-8'
diff --git a/alot/db/attachment.py b/alot/db/attachment.py
index 1181a125..ec0feaeb 100644
--- a/alot/db/attachment.py
+++ b/alot/db/attachment.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import os
import tempfile
import email.charset as charset
diff --git a/alot/db/envelope.py b/alot/db/envelope.py
index 89a99ffa..89c1f984 100644
--- a/alot/db/envelope.py
+++ b/alot/db/envelope.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import glob
import logging
import os
diff --git a/alot/db/manager.py b/alot/db/manager.py
index 057c72d0..53170f87 100644
--- a/alot/db/manager.py
+++ b/alot/db/manager.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
from collections import deque
import errno
import logging
diff --git a/alot/db/message.py b/alot/db/message.py
index 2e1fef54..10115072 100644
--- a/alot/db/message.py
+++ b/alot/db/message.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import email
import email.charset as charset
import functools
diff --git a/alot/db/thread.py b/alot/db/thread.py
index 25b75fb1..fe7ea10f 100644
--- a/alot/db/thread.py
+++ b/alot/db/thread.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
from datetime import datetime
from .message import Message
diff --git a/alot/db/utils.py b/alot/db/utils.py
index 6083968d..d7c56310 100644
--- a/alot/db/utils.py
+++ b/alot/db/utils.py
@@ -3,8 +3,6 @@
# Copyright © 2017 Dylan Baker <dylan@pnwbakers.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import os
import email
import email.charset as charset
diff --git a/alot/helper.py b/alot/helper.py
index b1880165..919793d8 100644
--- a/alot/helper.py
+++ b/alot/helper.py
@@ -3,9 +3,6 @@
# Copyright © 2017 Dylan Baker
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-from __future__ import division
-
from datetime import timedelta
from datetime import datetime
from collections import deque
diff --git a/alot/settings/const.py b/alot/settings/const.py
index 11137d1d..b1449c29 100644
--- a/alot/settings/const.py
+++ b/alot/settings/const.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
from .manager import SettingsManager
settings = SettingsManager()
diff --git a/alot/settings/manager.py b/alot/settings/manager.py
index 56e6eec8..3ef9eccf 100644
--- a/alot/settings/manager.py
+++ b/alot/settings/manager.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import imp
import itertools
import logging
diff --git a/alot/settings/theme.py b/alot/settings/theme.py
index d74cb0e7..e6d6eae8 100644
--- a/alot/settings/theme.py
+++ b/alot/settings/theme.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import os
from ..utils import configobj as checks
diff --git a/alot/settings/utils.py b/alot/settings/utils.py
index 8d656b79..65942aff 100644
--- a/alot/settings/utils.py
+++ b/alot/settings/utils.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import logging
from configobj import (ConfigObj, ConfigObjError, flatten_errors,
diff --git a/alot/ui.py b/alot/ui.py
index b3430e07..16a5297b 100644
--- a/alot/ui.py
+++ b/alot/ui.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import logging
import os
import signal
diff --git a/alot/utils/argparse.py b/alot/utils/argparse.py
index 9822882d..e824d068 100644
--- a/alot/utils/argparse.py
+++ b/alot/utils/argparse.py
@@ -17,8 +17,6 @@
"""Custom extensions of the argparse module."""
-from __future__ import absolute_import
-
import argparse
import collections
import functools
diff --git a/alot/utils/configobj.py b/alot/utils/configobj.py
index 78201690..73553a0c 100644
--- a/alot/utils/configobj.py
+++ b/alot/utils/configobj.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import mailbox
import re
from urllib.parse import urlparse
diff --git a/alot/walker.py b/alot/walker.py
index 2efb9886..e4264103 100644
--- a/alot/walker.py
+++ b/alot/walker.py
@@ -1,8 +1,6 @@
# Copyright (C) 2011-2012 Patrick Totzke <patricktotzke@gmail.com>
# This file is released under the GNU GPL, version 3 or a later revision.
# For further details see the COPYING file
-from __future__ import absolute_import
-
import logging
import urwid
diff --git a/alot/widgets/bufferlist.py b/alot/widgets/bufferlist.py
index 4f9187be..0ab315c5 100644
--- a/alot/widgets/bufferlist.py
+++ b/alot/widgets/bufferlist.py
@@ -5,8 +5,6 @@
"""
Widgets specific to Bufferlist mode
"""
-from __future__ import absolute_import
-
import urwid
diff --git a/alot/widgets/globals.py b/alot/widgets/globals.py
index 67ff984b..470a517f 100644
--- a/alot/widgets/globals.py
+++ b/alot/widgets/globals.py
@@ -5,8 +5,6 @@
"""
This contains alot-specific :class:`urwid.Widget` used in more than one mode.
"""
-from __future__ import absolute_import
-
import re
import operator
import urwid
diff --git a/alot/widgets/search.py b/alot/widgets/search.py
index 446a8964..130fbecc 100644
--- a/alot/widgets/search.py
+++ b/alot/widgets/search.py
@@ -4,8 +4,6 @@
"""
Widgets specific to search mode
"""
-from __future__ import absolute_import
-
import urwid
from ..settings.const import settings
diff --git a/alot/widgets/thread.py b/alot/widgets/thread.py
index 396cdf92..bef80b45 100644
--- a/alot/widgets/thread.py
+++ b/alot/widgets/thread.py
@@ -4,8 +4,6 @@
"""
Widgets specific to thread mode
"""
-from __future__ import absolute_import
-
import logging
import urwid
from urwidtrees import Tree, SimpleTree, CollapsibleTree
diff --git a/alot/widgets/utils.py b/alot/widgets/utils.py
index 86eb49b7..15a2c60b 100644
--- a/alot/widgets/utils.py
+++ b/alot/widgets/utils.py
@@ -5,8 +5,6 @@
"""
Utility Widgets not specific to alot
"""
-from __future__ import absolute_import
-
import urwid