py3: no __future__

JanHoefelmeyer · Aug 5, 2019 · aa43e7b · aa43e7b
1 parent dc872ae
commit aa43e7b
Show file tree

Hide file tree

Showing 68 changed files with 1 addition and 197 deletions.
diff --git a/src/moin/__init__.py b/src/moin/__init__.py
@@ -7,8 +7,6 @@
 """
 
 
-from __future__ import absolute_import, division
-
 import sys
 import platform
 

diff --git a/src/moin/_template.py b/src/moin/_template.py
@@ -1,4 +1,4 @@
-# Copyright: 2013 MoinMoin:YourNameHere
+# Copyright: 2019 MoinMoin:YourNameHere
 # License: GNU GPL v2 (or any later version), see LICENSE.txt for details.
 
 """
@@ -13,6 +13,3 @@
 Of course you'll have to edit/fix the Copyright line and also the docstring
 needs to be replaced with something making sense, but keep the structure.
 """
-
-
-from __future__ import absolute_import, division
diff --git a/src/moin/app.py b/src/moin/app.py
@@ -10,8 +10,6 @@
 Use create_app(config) to create the WSGI application (using Flask).
 """
 
-from __future__ import absolute_import, division
-
 import os
 import sys
 

diff --git a/src/moin/conftest.py b/src/moin/conftest.py
@@ -15,9 +15,6 @@
 use a Config class to define the required configuration within the test class.
 """
 
-
-from __future__ import absolute_import, division
-
 import pytest
 import py
 

diff --git a/src/moin/converters/_args_wiki.py b/src/moin/converters/_args_wiki.py
@@ -5,9 +5,6 @@
 MoinMoin - Arguments support for wiki formats
 """
 
-
-from __future__ import absolute_import, division
-
 import re
 
 from ._args import Arguments

diff --git a/src/moin/converters/_table.py b/src/moin/converters/_table.py
@@ -5,9 +5,6 @@
 MoinMoin - table data to DOM conversion support
 """
 
-
-from __future__ import absolute_import, division
-
 from moin.utils.tree import moin_page
 from emeraldtree import ElementTree as ET
 

diff --git a/src/moin/converters/_util.py b/src/moin/converters/_util.py
@@ -5,9 +5,6 @@
 MoinMoin - converter utilities
 """
 
-
-from __future__ import absolute_import, division
-
 try:
     from flask import g as flaskg
 except ImportError:

diff --git a/src/moin/converters/creole_in.py b/src/moin/converters/creole_in.py
@@ -22,9 +22,6 @@
   for the rest of the paragraph.
 """
 
-
-from __future__ import absolute_import, division
-
 import re
 
 from moin.constants.misc import URI_SCHEMES

diff --git a/src/moin/converters/docbook_in.py b/src/moin/converters/docbook_in.py
@@ -13,9 +13,6 @@
 - ulink
 """
 
-
-from __future__ import absolute_import, division
-
 import re
 
 from emeraldtree import ElementTree as ET

diff --git a/src/moin/converters/docbook_out.py b/src/moin/converters/docbook_out.py
@@ -8,9 +8,6 @@
 Converts an internal document tree into a DocBook v5 document.
 """
 
-
-from __future__ import absolute_import, division
-
 from emeraldtree import ElementTree as ET
 
 from moin.utils.tree import html, moin_page, xlink, docbook, xml

diff --git a/src/moin/converters/highlight.py b/src/moin/converters/highlight.py
@@ -5,9 +5,6 @@
 MoinMoin - Text highlighting converter
 """
 
-
-from __future__ import absolute_import, division
-
 import re
 
 from flask import request

diff --git a/src/moin/converters/html_in.py b/src/moin/converters/html_in.py
@@ -9,9 +9,6 @@
 TODO : Add support for style
 """
 
-
-from __future__ import absolute_import, division
-
 import re
 
 from flask import flash

diff --git a/src/moin/converters/html_out.py b/src/moin/converters/html_out.py
@@ -9,9 +9,6 @@
 Converts an internal document tree into a HTML tree.
 """
 
-
-from __future__ import absolute_import, division
-
 import re
 
 from flask import request

diff --git a/src/moin/converters/include.py b/src/moin/converters/include.py
@@ -88,9 +88,6 @@
 In the example above, only class="comment" will be applied to detail.csv.
 """
 
-
-from __future__ import absolute_import, division
-
 from emeraldtree import ElementTree as ET
 import re
 import types

diff --git a/src/moin/converters/link.py b/src/moin/converters/link.py
@@ -8,9 +8,6 @@
 special wiki links.
 """
 
-
-from __future__ import absolute_import, division
-
 from flask import g as flaskg
 
 from moin.utils.interwiki import is_known_wiki, url_for_item

diff --git a/src/moin/converters/macro.py b/src/moin/converters/macro.py
@@ -7,8 +7,6 @@
 Expands all macro elements in an internal Moin document.
 """
 
-from __future__ import absolute_import, division
-
 from flask import current_app as app
 
 from emeraldtree import ElementTree as ET

diff --git a/src/moin/converters/markdown_in.py b/src/moin/converters/markdown_in.py
@@ -8,9 +8,6 @@
 http://daringfireball.net/projects/markdown/
 """
 
-
-from __future__ import absolute_import, division
-
 import re
 import html.entities
 from collections import deque

diff --git a/src/moin/converters/markdown_out.py b/src/moin/converters/markdown_out.py
@@ -9,9 +9,6 @@
 Converts an internal document tree into markdown markup.
 """
 
-
-from __future__ import absolute_import, division
-
 import urllib.request
 import urllib.parse
 import urllib.error

diff --git a/src/moin/converters/mediawiki_in.py b/src/moin/converters/mediawiki_in.py
@@ -9,9 +9,6 @@
 MoinMoin - Media Wiki input converter
 """
 
-
-from __future__ import absolute_import, division
-
 import re
 from html.entities import name2codepoint
 

diff --git a/src/moin/converters/moinwiki19_in.py b/src/moin/converters/moinwiki19_in.py
@@ -8,9 +8,6 @@
 MoinMoin - Moin Wiki 1.9 input converter
 """
 
-
-from __future__ import absolute_import, division
-
 import re
 
 from moin import wikiutil

diff --git a/src/moin/converters/moinwiki_in.py b/src/moin/converters/moinwiki_in.py
@@ -8,9 +8,6 @@
 MoinMoin - Moin Wiki input converter
 """
 
-
-from __future__ import absolute_import, division
-
 import re
 
 from flask import request

diff --git a/src/moin/converters/moinwiki_out.py b/src/moin/converters/moinwiki_out.py
@@ -8,9 +8,6 @@
 Converts an internal document tree into moinwiki markup.
 """
 
-
-from __future__ import absolute_import, division
-
 import urllib.request
 import urllib.parse
 import urllib.error

diff --git a/src/moin/converters/nowiki.py b/src/moin/converters/nowiki.py
@@ -7,8 +7,6 @@
 Expands nowiki elements in an internal Moin document.
 """
 
-from __future__ import absolute_import, division
-
 import re
 
 from emeraldtree import ElementTree as ET

diff --git a/src/moin/converters/opendocument_in.py b/src/moin/converters/opendocument_in.py
@@ -7,9 +7,6 @@
 ODF documents can be created with OpenOffice.org, Libre Office and other software.
 """
 
-
-from __future__ import absolute_import, division
-
 import zipfile
 
 from moin.utils.mime import Type, type_text_plain

diff --git a/src/moin/converters/pdf_in.py b/src/moin/converters/pdf_in.py
@@ -5,9 +5,6 @@
 MoinMoin - PDF input converter
 """
 
-
-from __future__ import absolute_import, division
-
 from pdfminer3.pdfpage import PDFPage
 from pdfminer3.pdfparser import PDFParser
 from pdfminer3.pdfdocument import PDFDocument

diff --git a/src/moin/converters/pygments_in.py b/src/moin/converters/pygments_in.py
@@ -6,9 +6,6 @@
 MoinMoin - Pygments driven syntax highlighting input converter
 """
 
-
-from __future__ import absolute_import, division
-
 try:
     import pygments
     import pygments.formatter

diff --git a/src/moin/converters/rst_in.py b/src/moin/converters/rst_in.py
@@ -14,9 +14,6 @@
 Works with docutils version 0.5 (2008-06-25) or higher.
 """
 
-
-from __future__ import absolute_import, division
-
 import re
 
 import docutils

diff --git a/src/moin/converters/rst_out.py b/src/moin/converters/rst_out.py
@@ -10,9 +10,6 @@
 This converter based on ReStructuredText 2006-09-22.
 """
 
-
-from __future__ import absolute_import, division
-
 import re
 
 from emeraldtree import ElementTree as ET

diff --git a/src/moin/converters/smiley.py b/src/moin/converters/smiley.py
@@ -9,9 +9,6 @@
 element for the DOM Tree.
 """
 
-
-from __future__ import absolute_import, division
-
 import re
 
 from emeraldtree import ElementTree as ET

diff --git a/src/moin/converters/text_csv_in.py b/src/moin/converters/text_csv_in.py
@@ -5,9 +5,6 @@
 MoinMoin - CSV text data to DOM converter
 """
 
-
-from __future__ import absolute_import, division
-
 import csv
 
 from ._table import TableMixin

diff --git a/src/moin/converters/text_in.py b/src/moin/converters/text_in.py
@@ -12,9 +12,6 @@
 for the input mimetype.
 """
 
-
-from __future__ import absolute_import, division
-
 from moin.utils.mime import Type, type_moin_document
 from moin.utils.tree import moin_page
 

diff --git a/src/moin/converters/text_out.py b/src/moin/converters/text_out.py
@@ -11,9 +11,6 @@
 way, so we get indexable plain text for our search index.
 """
 
-
-from __future__ import absolute_import, division
-
 from . import default_registry
 from moin.utils.mime import Type, type_moin_document, type_text_plain
 

diff --git a/src/moin/converters/xml_in.py b/src/moin/converters/xml_in.py
@@ -5,8 +5,6 @@
 MoinMoin - Generic XML input converter
 """
 
-from __future__ import absolute_import, division
-
 import re
 
 from . import default_registry

diff --git a/src/moin/error.py b/src/moin/error.py
@@ -5,9 +5,6 @@
 MoinMoin errors / exception classes
 """
 
-
-from __future__ import absolute_import, division
-
 import sys
 
 from moin.constants.contenttypes import CHARSET

diff --git a/src/moin/items/ticket.py b/src/moin/items/ticket.py
@@ -35,9 +35,6 @@
 ticket through a refers_to field preserved in meta data.
 """
 
-
-from __future__ import absolute_import, division
-
 import time
 import datetime
 

diff --git a/src/moin/log.py b/src/moin/log.py
@@ -51,9 +51,6 @@
     will do the logging.
 """
 
-
-from __future__ import absolute_import, division
-
 from io import StringIO
 import os
 import logging

diff --git a/src/moin/storage/backends/__init__.py b/src/moin/storage/backends/__init__.py
@@ -6,9 +6,6 @@
 MoinMoin - backend base classes
 """
 
-
-from __future__ import absolute_import, division
-
 from abc import abstractmethod, ABCMeta
 
 

diff --git a/src/moin/storage/backends/_tests/__init__.py b/src/moin/storage/backends/_tests/__init__.py
@@ -5,9 +5,6 @@
 MoinMoin - backend tests
 """
 
-
-from __future__ import absolute_import, division
-
 from io import BytesIO
 
 import pytest

diff --git a/src/moin/storage/backends/_tests/test_fileserver.py b/src/moin/storage/backends/_tests/test_fileserver.py
@@ -5,9 +5,6 @@
 MoinMoin - fileserver backend tests
 """
 
-
-from __future__ import absolute_import, division
-
 import os
 import tempfile
 

diff --git a/src/moin/storage/backends/_tests/test_stores.py b/src/moin/storage/backends/_tests/test_stores.py
@@ -8,9 +8,6 @@
       but we better test with a fs AND a memory store.
 """
 
-
-from __future__ import absolute_import, division
-
 import os
 import tempfile
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,8 +7,6 @@ @@
     """
-    from __future__ import absolute_import, division
     import sys
     import platform
@@ Expand Down @@