rfctr: bulk Python 2 formatting updates

* encoding header is no longer needed
* from __future__ imports no longer needed
* make module docstrings PEP 257 compliant.

Author: scanny

features/environment.py

@@ -1,9 +1,4 @@
-# encoding: utf-8
-
-"""
-Used by behave to set testing environment before and after running acceptance
-tests.
-"""
+"""Set testing environment before and after behave acceptance test runs."""
 
 import os
 

src/docx/api.py

@@ -1,13 +1,9 @@
-# encoding: utf-8
+"""Directly exposed API functions and classes, :func:`Document` for now.
 
-"""
-Directly exposed API functions and classes, :func:`Document` for now.
 Provides a syntactically more convenient API for interacting with the
 OpcPackage graph.
 """
 
-from __future__ import absolute_import, division, print_function
-
 import os
 
 from docx.opc.constants import CONTENT_TYPE as CT

src/docx/blkcntnr.py

@@ -1,13 +1,9 @@
-# encoding: utf-8
-
 """Block item container, used by body, cell, header, etc.
 
 Block level items are things like paragraph and table, although there are a few other
 specialized ones like structured document tags.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from docx.oxml.table import CT_Tbl
 from docx.shared import Parented
 from docx.text.paragraph import Paragraph

src/docx/dml/color.py

@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-DrawingML objects related to color, ColorFormat being the most prominent.
-"""
-
-from __future__ import absolute_import, division, print_function, unicode_literals
+"""DrawingML objects related to color, ColorFormat being the most prominent."""
 
 from ..enum.dml import MSO_COLOR_TYPE
 from ..oxml.simpletypes import ST_HexColorAuto

src/docx/enum/__init__.py

@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Enumerations used in python-docx
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Enumerations used in python-docx."""
 
 
 class Enumeration(object):

src/docx/enum/shape.py

@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Enumerations related to DrawingML shapes in WordprocessingML files
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Enumerations related to DrawingML shapes in WordprocessingML files."""
 
 
 class WD_INLINE_SHAPE_TYPE(object):

src/docx/enum/text.py

@@ -5,17 +5,15 @@
 
 @alias("WD_ALIGN_PARAGRAPH")
 class WD_PARAGRAPH_ALIGNMENT(XmlEnumeration):
-    """
-    alias: **WD_ALIGN_PARAGRAPH**
+    """Alias: **WD_ALIGN_PARAGRAPH**
 
     Specifies paragraph justification type.
 
     Example::
 
-        from docx.enum.text import WD_ALIGN_PARAGRAPH
+    from docx.enum.text import WD_ALIGN_PARAGRAPH
 
-        paragraph = document.add_paragraph()
-        paragraph.alignment = WD_ALIGN_PARAGRAPH.CENTER
+    paragraph = document.add_paragraph() paragraph.alignment = WD_ALIGN_PARAGRAPH.CENTER
     """
 
     __ms_name__ = "WdParagraphAlignment"
@@ -38,34 +36,32 @@ class WD_PARAGRAPH_ALIGNMENT(XmlEnumeration):
             "JUSTIFY_MED",
             5,
             "mediumKashida",
-            "Justified with a medium char" "acter compression ratio.",
+            "Justified with a medium character compression ratio.",
         ),
         XmlMappedEnumMember(
             "JUSTIFY_HI",
             7,
             "highKashida",
-            "Justified with a high character" " compression ratio.",
+            "Justified with a high character compression ratio.",
         ),
         XmlMappedEnumMember(
             "JUSTIFY_LOW",
             8,
             "lowKashida",
-            "Justified with a low character " "compression ratio.",
+            "Justified with a low character compression ratio.",
         ),
         XmlMappedEnumMember(
             "THAI_JUSTIFY",
             9,
             "thaiDistribute",
-            "Justified according to Tha" "i formatting layout.",
+            "Justified according to Thai formatting layout.",
         ),
     )
 
 
 class WD_BREAK_TYPE(object):
-    """
-    Corresponds to WdBreakType enumeration
-    http://msdn.microsoft.com/en-us/library/office/ff195905.aspx
-    """
+    """Corresponds to WdBreakType enumeration http://msdn.microsoft.com/en-
+    us/library/office/ff195905.aspx."""
 
     COLUMN = 8
     LINE = 6
@@ -85,9 +81,9 @@ class WD_BREAK_TYPE(object):
 
 @alias("WD_COLOR")
 class WD_COLOR_INDEX(XmlEnumeration):
-    """
-    Specifies a standard preset color to apply. Used for font highlighting and
-    perhaps other applications.
+    """Specifies a standard preset color to apply.
+
+    Used for font highlighting and perhaps other applications.
     """
 
     __ms_name__ = "WdColorIndex"
@@ -121,15 +117,14 @@ class WD_COLOR_INDEX(XmlEnumeration):
 
 
 class WD_LINE_SPACING(XmlEnumeration):
-    """
-    Specifies a line spacing format to be applied to a paragraph.
+    """Specifies a line spacing format to be applied to a paragraph.
 
     Example::
 
-        from docx.enum.text import WD_LINE_SPACING
+    from docx.enum.text import WD_LINE_SPACING
 
-        paragraph = document.add_paragraph()
-        paragraph.line_spacing_rule = WD_LINE_SPACING.EXACTLY
+    paragraph = document.add_paragraph() paragraph.line_spacing_rule =
+    WD_LINE_SPACING.EXACTLY
     """
 
     __ms_name__ = "WdLineSpacing"
@@ -166,9 +161,7 @@ class WD_LINE_SPACING(XmlEnumeration):
 
 
 class WD_TAB_ALIGNMENT(XmlEnumeration):
-    """
-    Specifies the tab stop alignment to apply.
-    """
+    """Specifies the tab stop alignment to apply."""
 
     __ms_name__ = "WdTabAlignment"
 
@@ -189,9 +182,7 @@ class WD_TAB_ALIGNMENT(XmlEnumeration):
 
 
 class WD_TAB_LEADER(XmlEnumeration):
-    """
-    Specifies the character to use as the leader with formatted tabs.
-    """
+    """Specifies the character to use as the leader with formatted tabs."""
 
     __ms_name__ = "WdTabLeader"
 
@@ -208,9 +199,7 @@ class WD_TAB_LEADER(XmlEnumeration):
 
 
 class WD_UNDERLINE(XmlEnumeration):
-    """
-    Specifies the style of underline applied to a run of characters.
-    """
+    """Specifies the style of underline applied to a run of characters."""
 
     __ms_name__ = "WdUnderline"
 

src/docx/exceptions.py

@@ -1,7 +1,4 @@
-# encoding: utf-8
-
-"""
-Exceptions used with python-docx.
+"""Exceptions used with python-docx.
 
 The base exception class is PythonDocxError.
 """

src/docx/image/bmp.py

@@ -1,7 +1,3 @@
-# encoding: utf-8
-
-from __future__ import absolute_import, division, print_function
-
 from .constants import MIME_TYPE
 from .helpers import LITTLE_ENDIAN, StreamReader
 from .image import BaseImageHeader

src/docx/image/constants.py

@@ -1,8 +1,4 @@
-# encoding: utf-8
-
-"""
-Constants specific the the image sub-package
-"""
+"""Constants specific the the image sub-package."""
 
 
 class JPEG_MARKER_CODE(object):