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/base.py

@@ -1,12 +1,6 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-'''
+"""
 Basic support for manipulating OEB 1.x/2.0 content and metadata.
-'''
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
-__docformat__ = 'restructuredtext en'
-
+"""
 import os, re, logging, sys, numbers
 from collections import defaultdict
 from itertools import count
@@ -25,6 +19,11 @@ from ebook_converter.utils.short_uuid import uuid4
 from ebook_converter.polyglot.builtins import iteritems, unicode_type, string_or_bytes, range, itervalues, filter, codepoint_to_chr
 from ebook_converter.polyglot.urllib import unquote as urlunquote, urldefrag, urljoin, urlparse, urlunparse
 
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
+__docformat__ = 'restructuredtext en'
+
 XML_NS       = 'http://www.w3.org/XML/1998/namespace'
 OEB_DOC_NS   = 'http://openebook.org/namespaces/oeb-document/1.0/'
 OPF1_NS      = 'http://openebook.org/namespaces/oeb-package/1.0/'

ebook_converter/ebooks/oeb/normalize_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__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
-
 import numbers
 from functools import wraps
 
@@ -14,6 +7,10 @@ from ebook_converter.tinycss.fonts3 import parse_font, serialize_font_family
 from ebook_converter.ebooks.oeb.base import css_text
 from ebook_converter.polyglot.builtins import iteritems, string_or_bytes, unicode_type, zip
 
+
+__license__ = 'GPL v3'
+__copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
+
 DEFAULTS = {'azimuth': 'center', 'background-attachment': 'scroll',  # {{{
             'background-color': 'transparent', 'background-image': 'none',
             'background-position': '0% 0%', 'background-repeat': 'repeat',

ebook_converter/ebooks/oeb/parse_utils.py

@@ -1,11 +1,3 @@
-#!/usr/bin/env python2
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__   = 'GPL v3'
-__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
-__docformat__ = 'restructuredtext en'
-
 import re
 
 from lxml import etree, html
@@ -16,6 +8,11 @@ from ebook_converter.constants import filesystem_encoding
 from ebook_converter.ebooks.chardet import xml_to_unicode, strip_encoding_declarations
 from ebook_converter.polyglot.builtins import iteritems, itervalues, unicode_type, string_or_bytes, map
 
+
+__license__   = 'GPL v3'
+__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
 RECOVER_PARSER = etree.XMLParser(recover=True, no_network=True, resolve_entities=False)
 XHTML_NS     = 'http://www.w3.org/1999/xhtml'
 XMLNS_NS     = 'http://www.w3.org/2000/xmlns/'

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'
 

ebook_converter/ebooks/oeb/reader.py

@@ -1,11 +1,6 @@
 """
 Container-/OPF-based input OEBBook reader.
 """
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
-
 import sys, os, uuid, copy, re, io
 from collections import defaultdict
 
@@ -30,7 +25,10 @@ from ebook_converter import guess_type, xml_replace_entities
 from ebook_converter.polyglot.builtins import unicode_type, zip
 from ebook_converter.polyglot.urllib import unquote, urldefrag, urlparse
 
+
 __all__ = ['OEBReader']
+__license__   = 'GPL v3'
+__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
 
 
 class OEBReader(object):

ebook_converter/ebooks/oeb/stylizer.py

@@ -1,13 +1,6 @@
-# -*- encoding: utf-8 -*-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-'''
+"""
 CSS property propagation class.
-'''
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
-
+"""
 import os, re, logging, copy, unicodedata, numbers
 import pkg_resources
 from operator import itemgetter
@@ -25,6 +18,10 @@ from ebook_converter.css_selectors import Select, SelectorError, INAPPROPRIATE_P
 from ebook_converter.polyglot.builtins import iteritems, unicode_type, filter
 from ebook_converter.tinycss.media3 import CSSMedia3Parser
 
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
+
 css_parser_log.setLevel(logging.WARN)
 
 _html_css_stylesheet = None

ebook_converter/ebooks/oeb/transforms/cover.py

@@ -1,11 +1,3 @@
-#!/usr/bin/env python2
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__   = 'GPL v3'
-__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
-__docformat__ = 'restructuredtext en'
-
 import textwrap
 
 from ebook_converter import guess_type
@@ -15,6 +7,11 @@ from ebook_converter.polyglot.builtins import unicode_type
 from ebook_converter.polyglot.urllib import unquote
 
 
+__license__   = 'GPL v3'
+__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+
 class CoverManager(object):
 
     SVG_TEMPLATE = textwrap.dedent('''\

ebook_converter/ebooks/oeb/transforms/data_url.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__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
-
 import re
 from ebook_converter.ebooks.oeb.base import XPath, urlunquote
 from ebook_converter.polyglot.builtins import as_bytes
 
 
+__license__ = 'GPL v3'
+__copyright__ = '2014, Kovid Goyal <kovid at kovidgoyal.net>'
+
+
 class DataURL(object):
 
     def __call__(self, oeb, opts):

ebook_converter/ebooks/oeb/transforms/filenames.py

@@ -1,11 +1,3 @@
-#!/usr/bin/env python2
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__   = 'GPL v3'
-__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
-__docformat__ = 'restructuredtext en'
-
 import posixpath
 
 from lxml import etree
@@ -14,6 +6,11 @@ from ebook_converter.ebooks.oeb.base import rewrite_links, urlnormalize
 from ebook_converter.polyglot.urllib import urldefrag, urlparse
 
 
+__license__   = 'GPL v3'
+__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+
 class RenameFiles(object):  # {{{
 
     '''

ebook_converter/ebooks/oeb/transforms/flatcss.py

@@ -1,11 +1,6 @@
-'''
+"""
 CSS flattening transform.
-'''
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
-
+"""
 import re, operator, math, numbers
 from collections import defaultdict
 from xml.dom import SyntaxErr
@@ -23,6 +18,10 @@ from ebook_converter.utils.filenames import ascii_filename, ascii_text
 from ebook_converter.utils.icu import numeric_sort_key
 from ebook_converter.polyglot.builtins import iteritems, unicode_type, string_or_bytes, map
 
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
+
 COLLAPSE = re.compile(r'[ \t\r\n\v]+')
 STRIPNUM = re.compile(r'[-0-9]+$')
 

ebook_converter/ebooks/oeb/transforms/guide.py

@@ -1,7 +1,3 @@
-#!/usr/bin/env python2
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 __license__   = 'GPL v3'
 __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'

ebook_converter/ebooks/oeb/transforms/htmltoc.py

@@ -1,17 +1,15 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-'''
+"""
 HTML-TOC-adding transform.
-'''
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
-
+"""
 from ebook_converter.ebooks.oeb.base import XML, XHTML, XHTML_NS
 from ebook_converter.ebooks.oeb.base import XHTML_MIME, CSS_MIME
 from ebook_converter.ebooks.oeb.base import element, XPath
 from ebook_converter.polyglot.builtins import unicode_type
 
+
 __all__ = ['HTMLTOCAdder']
+__license__   = 'GPL v3'
+__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
 
 DEFAULT_TITLE = __('Table of Contents')
 

ebook_converter/ebooks/oeb/transforms/jacket.py

@@ -1,11 +1,3 @@
-#!/usr/bin/env python2
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__   = 'GPL v3'
-__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
-__docformat__ = 'restructuredtext en'
-
 import sys, os, re
 from xml.sax.saxutils import escape
 from string import Formatter
@@ -20,6 +12,11 @@ from ebook_converter.ebooks.chardet import strip_encoding_declarations
 from ebook_converter.ebooks.metadata import fmt_sidx, rating_to_stars
 from ebook_converter.polyglot.builtins import unicode_type, map
 
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
 JACKET_XPATH = '//h:meta[@name="calibre-content" and @content="jacket"]'
 
 

ebook_converter/ebooks/oeb/transforms/manglecase.py

@@ -1,11 +1,6 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-'''
+"""
 CSS case-mangling transform.
-'''
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
-
+"""
 from lxml import etree
 from ebook_converter.ebooks.oeb.base import XHTML, XHTML_NS
 from ebook_converter.ebooks.oeb.base import CSS_MIME
@@ -13,6 +8,10 @@ from ebook_converter.ebooks.oeb.base import namespace
 from ebook_converter.ebooks.oeb.stylizer import Stylizer
 from ebook_converter.polyglot.builtins import string_or_bytes
 
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
+
 CASE_MANGLER_CSS = """
 .calibre_lowercase {
     font-variant: normal;

ebook_converter/ebooks/oeb/transforms/metadata.py

@@ -1,17 +1,14 @@
-#!/usr/bin/env python2
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__   = 'GPL v3'
-__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
-__docformat__ = 'restructuredtext en'
-
 import os, re
 from ebook_converter.utils.date import isoformat, now
 from ebook_converter import guess_type
 from ebook_converter.polyglot.builtins import iteritems
 
 
+__license__   = 'GPL v3'
+__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+
 def meta_info_to_oeb_metadata(mi, m, log, override_input_metadata=False):
     from ebook_converter.ebooks.oeb.base import OPF
     if not mi.is_null('title'):

ebook_converter/ebooks/oeb/transforms/page_margin.py

@@ -1,11 +1,3 @@
-#!/usr/bin/env python2
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__   = 'GPL v3'
-__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
-__docformat__ = 'restructuredtext en'
-
 import numbers
 from collections import Counter
 
@@ -13,6 +5,11 @@ from ebook_converter.ebooks.oeb.base import barename, XPath
 from ebook_converter.polyglot.builtins import iteritems
 
 
+__license__   = 'GPL v3'
+__copyright__ = '2011, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+
 class RemoveAdobeMargins(object):
     '''
     Remove margins specified in Adobe's page templates.

ebook_converter/ebooks/oeb/transforms/rasterize.py

@@ -1,15 +1,11 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-'''
+"""
 SVG rasterization transform.
-'''
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
-
+"""
 import os, re
 
 # from PyQt5.Qt import (
     # Qt, QByteArray, QBuffer, QIODevice, QColor, QImage, QPainter, QSvgRenderer)
+
 from ebook_converter.ebooks.oeb.base import XHTML, XLINK
 from ebook_converter.ebooks.oeb.base import SVG_MIME, PNG_MIME
 from ebook_converter.ebooks.oeb.base import xml2str, xpath
@@ -20,6 +16,10 @@ from ebook_converter.utils.imghdr import what
 from ebook_converter.polyglot.builtins import unicode_type
 from ebook_converter.polyglot.urllib import urldefrag
 
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
+
 IMAGE_TAGS = {XHTML('img'), XHTML('object')}
 KEEP_ATTRS = {'class', 'style', 'width', 'height', 'align'}
 

ebook_converter/ebooks/oeb/transforms/rescale.py

@@ -1,13 +1,10 @@
-#!/usr/bin/env python2
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
-from __future__ import absolute_import, division, print_function, unicode_literals
+from ebook_converter import fit_image
+
 
 __license__   = 'GPL v3'
 __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-from ebook_converter import fit_image
-
 
 class RescaleImages(object):
 

ebook_converter/ebooks/oeb/transforms/split.py

@@ -1,14 +1,8 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-__license__   = 'GPL v3'
-__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
-__docformat__ = 'restructuredtext en'
-
-'''
+"""
 Splitting of the XHTML flows. Splitting can happen on page boundaries or can be
 forced at "likely" locations to conform to size limitations. This transform
 assumes a prior call to the flatcss transform.
-'''
-
+"""
 import os, functools, collections, re, copy
 from collections import OrderedDict
 
@@ -24,6 +18,10 @@ from ebook_converter.polyglot.builtins import iteritems, range, map, unicode_typ
 from ebook_converter.polyglot.urllib import unquote
 from ebook_converter.css_selectors import Select, SelectorError
 
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
+__docformat__ = 'restructuredtext en'
 XPath = functools.partial(_XPath, namespaces=NAMESPACES)
 
 SPLIT_POINT_ATTR = 'csp'

ebook_converter/ebooks/oeb/transforms/structure.py

@@ -1,11 +1,3 @@
-#!/usr/bin/env python2
-# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__   = 'GPL v3'
-__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
-__docformat__ = 'restructuredtext en'
-
 import re, uuid
 
 from lxml import etree
@@ -17,6 +9,11 @@ from ebook_converter.polyglot.builtins import itervalues, unicode_type
 from ebook_converter.polyglot.urllib import urlparse
 
 
+__license__   = 'GPL v3'
+__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+
 def XPath(x):
     try:
         return etree.XPath(x, namespaces=XPNSMAP)

ebook_converter/ebooks/oeb/transforms/subset.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__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>'
-__docformat__ = 'restructuredtext en'
-
 from collections import defaultdict
 
 from ebook_converter.ebooks.oeb.base import urlnormalize, css_text
@@ -14,6 +6,11 @@ from ebook_converter.polyglot.builtins import iteritems, itervalues, unicode_typ
 from ebook_converter.tinycss.fonts3 import parse_font_family
 
 
+__license__   = 'GPL v3'
+__copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+
 def get_font_properties(rule, default=None):
     '''
     Given a CSS rule, extract normalized font properties from

ebook_converter/ebooks/oeb/transforms/trimmanifest.py

@@ -1,16 +1,15 @@
-'''
+"""
 OPF manifest trimming transform.
-'''
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
-
+"""
 from ebook_converter.ebooks.oeb.base import CSS_MIME, OEB_DOCS
 from ebook_converter.ebooks.oeb.base import urlnormalize, iterlinks
 from ebook_converter.polyglot.urllib import urldefrag
 
 
+__license__   = 'GPL v3'
+__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
+
+
 class ManifestTrimmer(object):
 
     @classmethod

ebook_converter/ebooks/oeb/writer.py

@@ -1,16 +1,15 @@
-'''
+"""
 Directory output OEBBook writer.
-'''
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
-
+"""
 import os
+
 from ebook_converter.ebooks.oeb.base import OPF_MIME, xml2str
 from ebook_converter.ebooks.oeb.base import DirContainer, OEBError
 
+
 __all__ = ['OEBWriter']
+__license__   = 'GPL v3'
+__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
 
 
 class OEBWriter(object):