Removing unneeded from __future__ import statements.

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

ebook_converter/ebooks/docx/writer/container.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, os
 
 from lxml import etree
@@ -21,6 +14,10 @@ from ebook_converter.utils.zipfile import ZipFile
 from ebook_converter.polyglot.builtins import iteritems, map, unicode_type, native_string_type
 
 
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
 def xml2str(root, pretty_print=False, with_tail=False):
     if hasattr(etree, 'cleanup_namespaces'):
         etree.cleanup_namespaces(root)

ebook_converter/ebooks/docx/writer/fonts.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__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
-
 from collections import defaultdict
 from uuid import uuid4
 
@@ -13,6 +6,10 @@ from ebook_converter.ebooks.oeb.transforms.subset import find_font_face_rules
 from ebook_converter.polyglot.builtins import range
 
 
+__license__ = 'GPL v3'
+__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
 def obfuscate_font_data(data, key):
     prefix = bytearray(data[:32])
     key = bytearray(reversed(key.bytes))

ebook_converter/ebooks/docx/writer/from_html.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 collections import Counter
 
@@ -21,6 +14,10 @@ from ebook_converter.utils.localization import lang_as_iso639_1
 from ebook_converter.polyglot.builtins import unicode_type, string_or_bytes
 
 
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
 def lang_for_tag(tag):
     for attr in ('lang', '{http://www.w3.org/XML/1998/namespace}lang'):
         val = lang_as_iso639_1(tag.get(attr))

ebook_converter/ebooks/docx/writer/images.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__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
-
 import os
 import posixpath
 from collections import namedtuple
@@ -19,6 +12,10 @@ from ebook_converter.ebooks.docx.images import pt_to_emu
 from ebook_converter.utils.filenames import ascii_filename
 from ebook_converter.utils.imghdr import identify
 
+
+__license__ = 'GPL v3'
+__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
+
 Image = namedtuple('Image', 'rid fname width height fmt item')
 
 

ebook_converter/ebooks/docx/writer/links.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__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
-
 import posixpath, re
 from uuid import uuid4
 
@@ -13,6 +6,10 @@ from ebook_converter.polyglot.builtins import unicode_type
 from ebook_converter.polyglot.urllib import urlparse
 
 
+__license__ = 'GPL v3'
+__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
 def start_text(tag, prefix_len=0, top_level=True):
     ans = tag.text or ''
     limit = 50 - prefix_len

ebook_converter/ebooks/docx/writer/lists.py

@@ -1,15 +1,12 @@
-#!/usr/bin/env python2
-# vim:fileencoding=utf-8
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__ = 'GPL v3'
-__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
-
 from collections import defaultdict
 from operator import attrgetter
 
 from ebook_converter.polyglot.builtins import iteritems, itervalues, unicode_type
 
+
+__license__ = 'GPL v3'
+__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
+
 LIST_STYLES = frozenset(
     'disc circle square decimal decimal-leading-zero lower-roman upper-roman'
     ' lower-greek lower-alpha lower-latin upper-alpha upper-latin hiragana hebrew'

ebook_converter/ebooks/docx/writer/styles.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__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
-
 import numbers
 from collections import Counter, defaultdict
 from operator import attrgetter
@@ -17,6 +10,10 @@ from ebook_converter.utils.localization import lang_as_iso639_1
 from ebook_converter.polyglot.builtins import iteritems, filter, unicode_type
 from ebook_converter.tinycss.css21 import CSS21Parser
 
+
+__license__ = 'GPL v3'
+__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
+
 css_parser = CSS21Parser()
 
 border_edges = ('left', 'top', 'right', 'bottom')

ebook_converter/ebooks/docx/writer/tables.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__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
-
 from collections import namedtuple
 
 from ebook_converter.ebooks.docx.writer.utils import convert_color
@@ -12,6 +5,10 @@ from ebook_converter.ebooks.docx.writer.styles import read_css_block_borders as
 from ebook_converter.polyglot.builtins import iteritems, range, unicode_type
 
 
+__license__ = 'GPL v3'
+__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
 class Dummy(object):
     pass
 

ebook_converter/ebooks/docx/writer/utils.py

@@ -1,12 +1,9 @@
-#!/usr/bin/env python2
-# vim:fileencoding=utf-8
-from __future__ import absolute_import, division, print_function, unicode_literals
+from ebook_converter.tinycss.color3 import parse_color_string
+
 
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-from ebook_converter.tinycss.color3 import parse_color_string
-
 
 def int_or_zero(raw):
     try: