rfctr: remove Python 2 compatibility layer

Author: scanny

ref/xsd/vml-wordprocessingDrawing.xsd

@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+<xsd:schema
   xmlns="urn:schemas-microsoft-com:office:word"
-  targetNamespace="urn:schemas-microsoft-com:office:word" elementFormDefault="qualified"
-  attributeFormDefault="unqualified">
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  attributeFormDefault="unqualified"
+  elementFormDefault="qualified"
+  targetNamespace="urn:schemas-microsoft-com:office:word"
+>
   <xsd:element name="bordertop" type="CT_Border"/>
   <xsd:element name="borderleft" type="CT_Border"/>
   <xsd:element name="borderright" type="CT_Border"/>

src/docx/compat.py

@@ -5,9 +5,9 @@
 """
 
 import hashlib
+import io
 import os
 
-from docx.compat import BytesIO, is_string
 from docx.image.exceptions import UnrecognizedImageError
 from docx.shared import Emu, Inches, lazyproperty
 
@@ -30,7 +30,7 @@ def from_blob(cls, blob):
         Return a new |Image| subclass instance parsed from the image binary
         contained in *blob*.
         """
-        stream = BytesIO(blob)
+        stream = io.BytesIO(blob)
         return cls._from_stream(stream, blob)
 
     @classmethod
@@ -39,11 +39,11 @@ def from_file(cls, image_descriptor):
         Return a new |Image| subclass instance loaded from the image file
         identified by *image_descriptor*, a path or file-like object.
         """
-        if is_string(image_descriptor):
+        if isinstance(image_descriptor, str):
             path = image_descriptor
             with open(path, "rb") as f:
                 blob = f.read()
-                stream = BytesIO(blob)
+                stream = io.BytesIO(blob)
             filename = os.path.basename(path)
         else:
             stream = image_descriptor

src/docx/image/image.py

@@ -1,17 +1,14 @@
-# encoding: utf-8
+"""Objects related to parsing headers of JPEG image streams.
 
-"""
-Objects related to parsing headers of JPEG image streams, both JFIF and Exif
-sub-formats.
+Includes both JFIF and Exif sub-formats.
 """
 
-from __future__ import absolute_import, division, print_function
+import io
 
-from ..compat import BytesIO
-from .constants import JPEG_MARKER_CODE, MIME_TYPE
-from .helpers import BIG_ENDIAN, StreamReader
-from .image import BaseImageHeader
-from .tiff import Tiff
+from docx.image.constants import JPEG_MARKER_CODE, MIME_TYPE
+from docx.image.helpers import BIG_ENDIAN, StreamReader
+from docx.image.image import BaseImageHeader
+from docx.image.tiff import Tiff
 
 
 class Jpeg(BaseImageHeader):
@@ -460,7 +457,7 @@ def _tiff_from_exif_segment(cls, stream, offset, segment_length):
         # wrap full segment in its own stream and feed to Tiff()
         stream.seek(offset + 8)
         segment_bytes = stream.read(segment_length - 8)
-        substream = BytesIO(segment_bytes)
+        substream = io.BytesIO(segment_bytes)
         return Tiff.from_stream(substream)
 
 

src/docx/image/jpeg.py

@@ -1,10 +1,9 @@
 """Open Packaging Convention (OPC) objects related to package parts."""
 
-from docx.opc.compat import cls_method_fn
 from docx.opc.oxml import serialize_part_xml
 from docx.opc.packuri import PackURI
 from docx.opc.rel import Relationships
-from docx.opc.shared import lazyproperty
+from docx.opc.shared import cls_method_fn, lazyproperty
 from docx.oxml import parse_xml
 
 

src/docx/opc/compat.py

@@ -3,7 +3,6 @@
 import os
 from zipfile import ZIP_DEFLATED, ZipFile, is_zipfile
 
-from docx.opc.compat import is_string
 from docx.opc.exceptions import PackageNotFoundError
 from docx.opc.packuri import CONTENT_TYPES_URI
 
@@ -15,7 +14,7 @@ class PhysPkgReader(object):
 
     def __new__(cls, pkg_file):
         # if *pkg_file* is a string, treat it as a path
-        if is_string(pkg_file):
+        if isinstance(pkg_file, str):
             if os.path.isdir(pkg_file):
                 reader_cls = _DirPkgReader
             elif is_zipfile(pkg_file):

src/docx/opc/part.py

@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-"""
-Objects shared by opc modules.
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
+"""Objects shared by opc modules."""
 
 
 class CaseInsensitiveDict(dict):
@@ -26,6 +20,11 @@ def __setitem__(self, key, value):
         return super(CaseInsensitiveDict, self).__setitem__(key.lower(), value)
 
 
+def cls_method_fn(cls: type, method_name: str):
+    """Return method of `cls` having `method_name`."""
+    return getattr(cls, method_name)
+
+
 def lazyproperty(f):
     """
     @lazyprop decorator. Decorated method will be called only on first access

src/docx/opc/phys_pkg.py

@@ -3,7 +3,6 @@
 import re
 from datetime import datetime, timedelta
 
-from docx.compat import is_string
 from docx.oxml import parse_xml
 from docx.oxml.ns import nsdecls, qn
 from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrOne
@@ -281,7 +280,7 @@ def _set_element_datetime(self, prop_name, value):
 
     def _set_element_text(self, prop_name, value):
         """Set string value of *name* property to *value*."""
-        if not is_string(value):
+        if not isinstance(value, str):
             value = str(value)
 
         if len(value) > 255:

src/docx/opc/shared.py

@@ -1,9 +1,5 @@
-# encoding: utf-8
-
 """Custom element classes related to document settings"""
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from docx.oxml.xmlchemy import BaseOxmlElement, ZeroOrOne