Merge pull request #205 from Gamma3000/future-order

Future statement ordering

23 files changed, 36 insertions, 33 deletions

diff --git a/markdown/__init__.py b/markdown/__init__.py
index 8872023..1dbaddd 100644
--- a/markdown/__init__.py
+++ b/markdown/__init__.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 Python Markdown
 ===============
@@ -32,6 +31,7 @@ License: BSD (see LICENSE for details).
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from .__version__ import version, version_info
 import re
 import codecs
diff --git a/markdown/blockprocessors.py b/markdown/blockprocessors.py
index a681d6c..61977b4 100644
--- a/markdown/blockprocessors.py
+++ b/markdown/blockprocessors.py
@@ -1,17 +1,19 @@
-from __future__ import unicode_literals
-# CORE MARKDOWN BLOCKPARSER
-# ===========================================================================
-#
-# This parser handles basic parsing of Markdown blocks.  It doesn't concern itself
-# with inline elements such as **bold** or *italics*, but rather just catches 
-# blocks, lists, quotes, etc.
-#
-# The BlockParser is made up of a bunch of BlockProssors, each handling a 
-# different type of block. Extensions may add/replace/remove BlockProcessors
-# as they need to alter how markdown blocks are parsed.
+"""
+CORE MARKDOWN BLOCKPARSER
+===========================================================================
+
+This parser handles basic parsing of Markdown blocks.  It doesn't concern itself
+with inline elements such as **bold** or *italics*, but rather just catches
+blocks, lists, quotes, etc.
+
+The BlockParser is made up of a bunch of BlockProssors, each handling a
+different type of block. Extensions may add/replace/remove BlockProcessors
+as they need to alter how markdown blocks are parsed.
+"""
 
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import unicode_literals
 import logging
 import re
 from . import util
diff --git a/markdown/extensions/__init__.py b/markdown/extensions/__init__.py
index 960d8f9..184c4d1 100644
--- a/markdown/extensions/__init__.py
+++ b/markdown/extensions/__init__.py
@@ -1,9 +1,10 @@
-from __future__ import unicode_literals
 """
 Extensions
 -----------------------------------------------------------------------------
 """
 
+from __future__ import unicode_literals
+
 class Extension(object):
     """ Base class for extensions to subclass. """
     def __init__(self, configs = {}):
diff --git a/markdown/extensions/abbr.py b/markdown/extensions/abbr.py
index 76a08cd..5e46f1d 100644
--- a/markdown/extensions/abbr.py
+++ b/markdown/extensions/abbr.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 '''
 Abbreviation Extension for Python-Markdown
 ==========================================
@@ -25,6 +24,7 @@ Copyright 2007-2008
 '''
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 from ..preprocessors import Preprocessor
 from ..inlinepatterns import Pattern
diff --git a/markdown/extensions/admonition.py b/markdown/extensions/admonition.py
index 98dcb3a..9a45b92 100644
--- a/markdown/extensions/admonition.py
+++ b/markdown/extensions/admonition.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 Admonition extension for Python-Markdown
 ========================================
@@ -42,6 +41,7 @@ By [Tiago Serafim](http://www.tiagoserafim.com/).
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 from ..blockprocessors import BlockProcessor
 from ..util import etree
diff --git a/markdown/extensions/attr_list.py b/markdown/extensions/attr_list.py
index 7beaa6a..c98aa85 100644
--- a/markdown/extensions/attr_list.py
+++ b/markdown/extensions/attr_list.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 Attribute List Extension for Python-Markdown
 ============================================
@@ -20,6 +19,7 @@ Dependencies:
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 from ..treeprocessors import Treeprocessor
 from ..util import isBlockLevel
diff --git a/markdown/extensions/codehilite.py b/markdown/extensions/codehilite.py
index 89c0251..72b40fd 100644
--- a/markdown/extensions/codehilite.py
+++ b/markdown/extensions/codehilite.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 CodeHilite Extension for Python-Markdown
 ========================================
@@ -20,6 +19,7 @@ Dependencies:
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 from ..treeprocessors import Treeprocessor
 import warnings
diff --git a/markdown/extensions/def_list.py b/markdown/extensions/def_list.py
index 872f9e2..8684652 100644
--- a/markdown/extensions/def_list.py
+++ b/markdown/extensions/def_list.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 Definition List Extension for Python-Markdown
 =============================================
@@ -20,6 +19,7 @@ Copyright 2008 - [Waylan Limberg](http://achinghead.com)
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 from ..blockprocessors import BlockProcessor, ListIndentProcessor
 from ..util import etree
diff --git a/markdown/extensions/extra.py b/markdown/extensions/extra.py
index 5b8876c..e6a1e82 100644
--- a/markdown/extensions/extra.py
+++ b/markdown/extensions/extra.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 Python-Markdown Extra Extension
 ===============================
@@ -28,6 +27,7 @@ when you upgrade to any future version of Python-Markdown.
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 
 extensions = ['smart_strong',
diff --git a/markdown/extensions/fenced_code.py b/markdown/extensions/fenced_code.py
index 9ec300b..ecdb20d 100644
--- a/markdown/extensions/fenced_code.py
+++ b/markdown/extensions/fenced_code.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 Fenced Code Extension for Python Markdown
 =========================================
@@ -75,6 +74,7 @@ Dependencies:
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 from ..preprocessors import Preprocessor
 from .codehilite import CodeHilite, CodeHiliteExtension
diff --git a/markdown/extensions/footnotes.py b/markdown/extensions/footnotes.py
index 131466c..65ed597 100644
--- a/markdown/extensions/footnotes.py
+++ b/markdown/extensions/footnotes.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 ========================= FOOTNOTES =================================
 
@@ -25,6 +24,7 @@ Example:
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 from ..preprocessors import Preprocessor
 from ..inlinepatterns import Pattern
diff --git a/markdown/extensions/headerid.py b/markdown/extensions/headerid.py
index 33d7d90..7681b8d 100644
--- a/markdown/extensions/headerid.py
+++ b/markdown/extensions/headerid.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 HeaderID Extension for Python-Markdown
 ======================================
@@ -76,6 +75,7 @@ Dependencies:
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 from ..treeprocessors import Treeprocessor
 import re
diff --git a/markdown/extensions/meta.py b/markdown/extensions/meta.py
index a2fbe80..aaff436 100644
--- a/markdown/extensions/meta.py
+++ b/markdown/extensions/meta.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 Meta Data Extension for Python-Markdown
 =======================================
@@ -41,6 +40,7 @@ License: BSD (see ../LICENSE.md for details)
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 from ..preprocessors import Preprocessor
 import re
diff --git a/markdown/extensions/nl2br.py b/markdown/extensions/nl2br.py
index 5636214..da4b339 100644
--- a/markdown/extensions/nl2br.py
+++ b/markdown/extensions/nl2br.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 NL2BR Extension
 ===============
@@ -22,6 +21,7 @@ Dependencies:
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 from ..inlinepatterns import SubstituteTagPattern
 
diff --git a/markdown/extensions/sane_lists.py b/markdown/extensions/sane_lists.py
index 5620ccd..23e9a7f 100644
--- a/markdown/extensions/sane_lists.py
+++ b/markdown/extensions/sane_lists.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 Sane List Extension for Python-Markdown
 =======================================
@@ -20,6 +19,7 @@ Copyright 2011 - [Waylan Limberg](http://achinghead.com)
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 from ..blockprocessors import OListProcessor, UListProcessor
 import re
diff --git a/markdown/extensions/smart_strong.py b/markdown/extensions/smart_strong.py
index 7ce2d4d..4818cf9 100644
--- a/markdown/extensions/smart_strong.py
+++ b/markdown/extensions/smart_strong.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 '''
 Smart_Strong Extension for Python-Markdown
 ==========================================
@@ -24,6 +23,7 @@ Copyright 2011
 '''
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 from ..inlinepatterns import SimpleTagPattern
 
diff --git a/markdown/extensions/tables.py b/markdown/extensions/tables.py
index 3edaccf..ad52ec1 100644
--- a/markdown/extensions/tables.py
+++ b/markdown/extensions/tables.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 Tables Extension for Python-Markdown
 ====================================
@@ -16,6 +15,7 @@ Copyright 2009 - [Waylan Limberg](http://achinghead.com)
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 from ..blockprocessors import BlockProcessor
 from ..util import etree
diff --git a/markdown/extensions/toc.py b/markdown/extensions/toc.py
index c672313..73b0844 100644
--- a/markdown/extensions/toc.py
+++ b/markdown/extensions/toc.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 Table of Contents Extension for Python-Markdown
 * * *
@@ -11,6 +10,7 @@ Dependencies:
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 from ..treeprocessors import Treeprocessor
 from ..util import etree
diff --git a/markdown/extensions/wikilinks.py b/markdown/extensions/wikilinks.py
index de4d9aa..877890b 100644
--- a/markdown/extensions/wikilinks.py
+++ b/markdown/extensions/wikilinks.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 '''
 WikiLinks Extension for Python-Markdown
 ======================================
@@ -78,6 +77,7 @@ Dependencies:
 '''
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import Extension
 from ..inlinepatterns import Pattern
 from ..util import etree
diff --git a/markdown/inlinepatterns.py b/markdown/inlinepatterns.py
index e8ecaea..de957ef 100644
--- a/markdown/inlinepatterns.py
+++ b/markdown/inlinepatterns.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 INLINE PATTERNS
 =============================================================================
@@ -43,6 +42,7 @@ So, we apply the expressions in the following order:
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import util
 from . import odict
 import re
diff --git a/markdown/postprocessors.py b/markdown/postprocessors.py
index 36fa98d..5f3f032 100644
--- a/markdown/postprocessors.py
+++ b/markdown/postprocessors.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 POST-PROCESSORS
 =============================================================================
@@ -10,6 +9,7 @@ processing.
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import util
 from . import odict
 import re
diff --git a/markdown/preprocessors.py b/markdown/preprocessors.py
index e61a6b8..72b2ed6 100644
--- a/markdown/preprocessors.py
+++ b/markdown/preprocessors.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 """
 PRE-PROCESSORS
 =============================================================================
@@ -8,6 +7,7 @@ complicated.
 """
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import util
 from . import odict
 import re
diff --git a/markdown/serializers.py b/markdown/serializers.py
index 977d6e8..b19d61c 100644
--- a/markdown/serializers.py
+++ b/markdown/serializers.py
@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 # markdown/searializers.py
 #
 # Add x/html serialization to Elementree
@@ -39,6 +38,7 @@ from __future__ import unicode_literals
 
 
 from __future__ import absolute_import
+from __future__ import unicode_literals
 from . import util
 ElementTree = util.etree.ElementTree
 QName = util.etree.QName