Removing unneeded from __future__ import statements.

Since we are on Python 3.6 and up, we don't need those anymore.

ebook_converter/ebooks/oeb/polish/container.py

@@ -1,8 +1,3 @@
-#!/usr/bin/env python2
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai
-# License: GPLv3 Copyright: 2013, Kovid Goyal <kovid at kovidgoyal.net>
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import errno
 import hashlib
 import logging

ebook_converter/ebooks/oeb/polish/css.py

@@ -1,10 +1,3 @@
-#!/usr/bin/env python2
-# vim:fileencoding=utf-8
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__ = 'GPL v3'
-__copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
-
 from collections import defaultdict
 from functools import partial
 
@@ -20,6 +13,10 @@ from ebook_converter.css_selectors import Select, SelectorError
 from ebook_converter.polyglot.builtins import iteritems, itervalues, unicode_type, filter
 
 
+__license__ = 'GPL v3'
+__copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
 def filter_used_rules(rules, log, select):
     for rule in rules:
         used = False

ebook_converter/ebooks/oeb/polish/errors.py

@@ -1,13 +1,10 @@
-#!/usr/bin/env python2
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai
-from __future__ import absolute_import, division, print_function, unicode_literals
+from ebook_converter.ebooks import DRMError as _DRMError
+
 
 __license__   = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-from ebook_converter.ebooks import DRMError as _DRMError
-
 
 class InvalidBook(ValueError):
     pass

ebook_converter/ebooks/oeb/polish/opf.py

@@ -1,16 +1,13 @@
-#!/usr/bin/env python2
-# vim:fileencoding=utf-8
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__ = 'GPL v3'
-__copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
-
 from lxml import etree
 
 from ebook_converter.ebooks.oeb.polish.container import OPF_NAMESPACES
 from ebook_converter.utils.localization import canonicalize_lang
 
 
+__license__ = 'GPL v3'
+__copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
 def get_book_language(container):
     for lang in container.opf_xpath('//dc:language'):
         raw = lang.text

ebook_converter/ebooks/oeb/polish/parsing.py

@@ -1,10 +1,3 @@
-#!/usr/bin/env python2
-# vim:fileencoding=utf-8
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__ = 'GPL v3'
-__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
-
 import re
 
 from lxml.etree import Element as LxmlElement
@@ -16,6 +9,10 @@ from ebook_converter.ebooks.chardet import xml_to_unicode, strip_encoding_declar
 from ebook_converter.utils.cleantext import clean_xml_chars
 from ebook_converter.polyglot.builtins import unicode_type
 
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
 XHTML_NS     = 'http://www.w3.org/1999/xhtml'
 
 

ebook_converter/ebooks/oeb/polish/pretty.py

@@ -1,10 +1,3 @@
-#!/usr/bin/env python2
-# vim:fileencoding=utf-8
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__ = 'GPL v3'
-__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
-
 import textwrap
 from ebook_converter.polyglot.builtins import iteritems, map
 
@@ -18,6 +11,9 @@ from ebook_converter.ebooks.oeb.polish.utils import guess_type
 from ebook_converter.utils.icu import sort_key
 
 
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
 def isspace(x):
     return not x.strip('\u0009\u000a\u000c\u000d\u0020')
 

ebook_converter/ebooks/oeb/polish/replace.py

@@ -1,11 +1,3 @@
-#!/usr/bin/env python2
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__   = 'GPL v3'
-__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
-__docformat__ = 'restructuredtext en'
-
 import codecs, shutil, os, posixpath
 from ebook_converter.polyglot.builtins import iteritems, itervalues, map
 from functools import partial
@@ -19,6 +11,11 @@ from ebook_converter.ebooks.oeb.polish.utils import extract
 from ebook_converter.polyglot.urllib import urlparse, urlunparse
 
 
+__license__   = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+
 class LinkReplacer(object):
 
     def __init__(self, base, container, link_map, frag_map):

ebook_converter/ebooks/oeb/polish/split.py

@@ -1,10 +1,3 @@
-#!/usr/bin/env python2
-# vim:fileencoding=utf-8
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__ = 'GPL v3'
-__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
-
 import copy, os, re
 from ebook_converter.polyglot.builtins import map, string_or_bytes, range
 
@@ -16,6 +9,10 @@ from ebook_converter.polyglot.builtins import iteritems, unicode_type
 from ebook_converter.polyglot.urllib import urlparse
 
 
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
 class AbortError(ValueError):
     pass
 

ebook_converter/ebooks/oeb/polish/toc.py

@@ -1,11 +1,3 @@
-#!/usr/bin/env python2
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:fdm=marker:ai
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__   = 'GPL v3'
-__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
-__docformat__ = 'restructuredtext en'
-
 import re
 from collections import Counter, OrderedDict
 from functools import partial
@@ -26,6 +18,11 @@ from ebook_converter.utils.localization import get_lang, canonicalize_lang, lang
 from ebook_converter.polyglot.builtins import iteritems, map, unicode_type
 from ebook_converter.polyglot.urllib import urlparse
 
+
+__license__   = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
 ns = etree.FunctionNamespace('calibre_xpath_extensions')
 ns.prefix = 'calibre'
 ns['lower-case'] = lambda c, x: x.lower() if hasattr(x, 'lower') else x

ebook_converter/ebooks/oeb/polish/utils.py

@@ -1,10 +1,3 @@
-#!/usr/bin/env python2
-# vim:fileencoding=utf-8
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__ = 'GPL v3'
-__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
-
 import re, os
 from bisect import bisect
 
@@ -12,6 +5,10 @@ from ebook_converter import guess_type as _guess_type, replace_entities
 from ebook_converter.polyglot.builtins import filter
 
 
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
 def guess_type(x):
     return _guess_type(x)[0] or 'application/octet-stream'