Remove six and replace all with py3 (#2)

Author: blms

neuxml/utils/__init__.py

@@ -21,10 +21,7 @@
 import logging
 import os
 
-import six
-
 from neuxml import xmlmap
-from neuxml.utils.compat import u
 
 logger = logging.getLogger(__name__)
 
@@ -281,7 +278,7 @@ def from_email_message(cls, message, local_id=None):
             payload = message.get_payload(decode=False)
 
             # if not unicode, attempt to convert
-            if isinstance(payload, six.binary_type):
+            if isinstance(payload, bytes):
                 charset = message.get_charset()
                 # decode according to the specified character set, if any
                 if charset is not None:
@@ -290,14 +287,14 @@ def from_email_message(cls, message, local_id=None):
 
                 # otherwise, just try to convert
                 else:
-                    payload = u(payload)
+                    payload = str(payload)
 
             # remove any control characters not allowed in XML
             control_char_map = dict.fromkeys(range(32))
             for i in [9, 10, 13]: # preserve horizontal tab, line feed, carriage return
                 del control_char_map[i]
 
-            payload = u(payload).translate(control_char_map)
+            payload = str(payload).translate(control_char_map)
 
             result.single_body.body_content.content = payload
 

neuxml/utils/compat.py

@@ -16,16 +16,10 @@
 
 from __future__ import unicode_literals
 import logging
-import os
-import warnings
-import urllib
-import time
+import io
 from lxml import etree
 from lxml.builder import ElementMaker
-import six
-from six.moves.urllib.request import urlopen
 
-from neuxml.utils.compat import u
 from neuxml.xmlmap.fields import Field
 
 
@@ -193,7 +187,7 @@ def __new__(cls, name, bases, defined_attrs):
                 # collect self-referential NodeFields so that we can resolve
                 # them once we've created the new class
                 node_class = getattr(field, 'node_class', None)
-                if isinstance(node_class, six.string_types):
+                if isinstance(node_class, str):
                     if node_class in ('self', name):
                         recursive_fields.append(field)
                     else:
@@ -235,8 +229,7 @@ def create_field(xmlobject):
         return create_field
 
 
-@six.python_2_unicode_compatible
-class XmlObject(six.with_metaclass(XmlObjectType, object)):
+class XmlObject(object, metaclass=XmlObjectType):
 
     """
     A Python object wrapped around an XML node.
@@ -324,15 +317,15 @@ def __init__(self, node=None, context=None, **kwargs):
 
         # xpath has no notion of a default namespace - omit any namespace with no prefix
         self.context = {'namespaces': dict([(prefix, ns) for prefix, ns
-                                            in six.iteritems(nsmap) if prefix])}
+                                            in nsmap.items() if prefix])}
 
         if context is not None:
             self.context.update(context)
         if hasattr(self, 'ROOT_NAMESPACES'):
             # also include any root namespaces to guarantee that expected prefixes are available
             self.context['namespaces'].update(self.ROOT_NAMESPACES)
 
-        for field, value in six.iteritems(kwargs):
+        for field, value in kwargs.items():
             # TODO (maybe): handle setting/creating list fields
             setattr(self, field, value)
 
@@ -373,8 +366,8 @@ def xsl_transform(self, filename=None, xsl=None, return_type=None, **params):
             return_type = XmlObject
 
         # automatically encode any string params as XSLT string parameters
-        for key, val in six.iteritems(params):
-            if isinstance(val, six.string_types):
+        for key, val in params.items():
+            if isinstance(val, str):
                 params[key] = etree.XSLT.strparam(val)
 
         parser = _get_xmlparser()
@@ -407,7 +400,7 @@ def xsl_transform(self, filename=None, xsl=None, return_type=None, **params):
         # empty xmlobject which will behave unexpectedly.
 
         # text output does not include a root node, so check separately
-        if issubclass(return_type, six.string_types):
+        if issubclass(return_type, str):
             if result is None:
                 logger.warning("XSL transform generated an empty result")
                 return
@@ -421,14 +414,14 @@ def xsl_transform(self, filename=None, xsl=None, return_type=None, **params):
             return return_type(result.getroot())
 
     def __str__(self):
-        if isinstance(self.node, six.string_types):
+        if isinstance(self.node, str):
             return self.node
         return self.node.xpath("normalize-space(.)")
 
     def __string__(self):
-        if isinstance(self.node, six.string_types):
+        if isinstance(self.node, str):
             return self.node
-        return u(self).encode('ascii', 'xmlcharrefreplace')
+        return str(self).encode('ascii', 'xmlcharrefreplace')
 
     def __eq__(self, other):
         # consider two xmlobjects equal if they are pointing to the same xml node
@@ -471,7 +464,7 @@ def _serialize(self, node, stream=None, pretty=False, xml_declaration=False):
         # actual logic of xml serialization
         if stream is None:
             string_mode = True
-            stream = six.BytesIO()
+            stream = io.BytesIO()
         else:
             string_mode = False
 

neuxml/xmlmap/cerp.py

@@ -17,8 +17,6 @@
 from __future__ import unicode_literals
 from copy import deepcopy
 
-import six
-
 from neuxml import xmlmap
 
 # xmlmap objects for various sections of an ead
@@ -62,7 +60,6 @@ class Section(_EadBase):
     ":class:`Note`"
 
 
-@six.python_2_unicode_compatible
 class Heading(_EadBase):
     """Generic xml object for headings used under `controlaccess`"""
     source = xmlmap.StringField("@source")
@@ -107,7 +104,6 @@ class ControlledAccessHeadings(Section):
     "list of :class:`ControlledAccessHeadings` - recursive mapping to `controlaccess`"
 
 
-@six.python_2_unicode_compatible
 class Container(_EadBase):
     """
     Container - :class:`DescriptiveIdentification` subelement for locating materials.
@@ -123,7 +119,6 @@ def __str__(self):
         return self.value
 
 
-@six.python_2_unicode_compatible
 class DateField(_EadBase):
     """
     DateField - for access to date and unitdate elements value and attributes.
@@ -312,7 +307,6 @@ def hasSeries(self):
             return False
 
 
-@six.python_2_unicode_compatible
 class Reference(_EadBase):
     """Internal linking element that may contain text.
 

neuxml/xmlmap/core.py

@@ -21,9 +21,7 @@
 
 from lxml import etree
 from lxml.builder import ElementMaker
-import six
 
-from neuxml.utils.compat import u
 from neuxml.xpath import ast, parse, serialize
 
 __all__ = [
@@ -94,7 +92,7 @@ def to_xml(self, value):
         if value is None:
             return value
         else:
-            return u(value)
+            return str(value)
 
 
 class StringMapper(Mapper):
@@ -106,7 +104,7 @@ def __init__(self, normalize=False):
     def to_python(self, node):
         if node is None:
             return None
-        if isinstance(node, six.string_types):
+        if isinstance(node, str):
             return node
         return self.XPATH(node)
 
@@ -117,7 +115,7 @@ def to_python(self, node):
             return None
         try:
             # xpath functions such as count return a float and must be converted to int
-            if isinstance(node, six.string_types) or isinstance(node, float):
+            if isinstance(node, str) or isinstance(node, float):
                 return int(node)
 
             return int(self.XPATH(node))
@@ -131,7 +129,7 @@ def to_python(self, node):
         if node is None:
             return None
         try:
-            if isinstance(node, six.string_types):
+            if isinstance(node, str):
                 return float(node)
 
             return float(self.XPATH(node))
@@ -155,7 +153,7 @@ def to_python(self, node):
             else:
                 return None
 
-        if isinstance(node, six.string_types):
+        if isinstance(node, str):
             value = node
         else:
             value = self.XPATH(node)
@@ -187,7 +185,7 @@ def __init__(self, format=None, normalize=False):
     def to_python(self, node):
         if node is None:
             return None
-        if isinstance(node, six.string_types):
+        if isinstance(node, str):
             rep = node
         else:
             rep = self.XPATH(node)
@@ -209,9 +207,9 @@ def to_python(self, node):
     def to_xml(self, dt):
         val = None
         if self.format is not None:
-            val = u(dt.strftime(self.format))
+            val = str(dt.strftime(self.format))
         else:
-            val = u(dt.isoformat())
+            val = str(dt.isoformat())
         return val
 
 
@@ -225,7 +223,7 @@ def __init__(self, format=None, normalize=False):
     def to_python(self, node):
         if node is None:
             return None
-        if isinstance(node, six.string_types):
+        if isinstance(node, str):
             rep = node
         elif hasattr(node, 'text'):
             rep = node.text
@@ -365,7 +363,7 @@ def _predicate_is_constructible(pred):
             if not _predicate_is_constructible(pred.left):
                 return False
             if not isinstance(pred.right,
-                    (six.integer_types, six.string_types, ast.VariableReference)):
+                    (int, str, ast.VariableReference)):
                 return False
 
     # otherwise, i guess we're ok
@@ -730,7 +728,7 @@ def __ne__(self, other):
 
     def _check_key_type(self, key):
         # check argument type for getitem, setitem, delitem
-        if not isinstance(key, (slice, six.integer_types)):
+        if not isinstance(key, (slice, int)):
             raise TypeError
         assert not isinstance(key, slice), "Slice indexing is not supported"
 

neuxml/xmlmap/eadmap.py

@@ -20,9 +20,6 @@
 (Metadata Object Description Schema).
 '''
 
-from __future__ import unicode_literals
-import six
-
 from neuxml import xmlmap
 
 MODS_NAMESPACE = 'http://www.loc.gov/mods/v3'
@@ -42,7 +39,6 @@ class Common(xmlmap.XmlObject):
     XSD_SCHEMA = MODSv34_SCHEMA
     schema_validate = False
 
-@six.python_2_unicode_compatible
 class Date(Common):
     ''':class:`~neuxml.xmlmap.XmlObject` for MODS date element (common fields
     for the dates under mods:originInfo).'''
@@ -192,7 +188,7 @@ def __unicode__(self):
         # default text display of a name (excluding roles for now)
         # TODO: improve logic for converting to plain-text name
         # (e.g., for template display, setting as dc:creator, etc)
-        return ' '.join([unicode(part) for part in self.name_parts])
+        return ' '.join([str(part) for part in self.name_parts])
 
 class Genre(Common):
     ROOT_NAME = 'genre'

neuxml/xmlmap/fields.py

@@ -23,22 +23,6 @@
 perhaps introspect ASTs returned by the parser.
 '''
 
-from __future__ import unicode_literals
-import sys
-
-
-# python2/3 string type logic borrowed from six
-# NOTE: not importing six here because setup.py needs to generate
-# the parser at install time, when six installation is not yet available
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    string_types = str
-else:
-    string_types = basestring
-
-
 __all__ = [
     'serialize',
     'UnaryExpression',
@@ -64,7 +48,7 @@ def _serialize(xp_ast):
     if hasattr(xp_ast, '_serialize'):
         for tok in xp_ast._serialize():
             yield tok
-    elif isinstance(xp_ast, string_types):
+    elif isinstance(xp_ast, str):
         # strings in serialized xpath needed to be quoted
         # (e.g. for use in paths, comparisons, etc)
         # using repr to quote them; for unicode, the leading

neuxml/xmlmap/mods.py

@@ -23,7 +23,7 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Text Processing :: Markup :: XML",
 ]
-dependencies = ["ply>=3.8", "lxml>=3.4", "six>=1.10", "rdflib>=3.0"]
+dependencies = ["ply>=3.8", "lxml>=3.4", "rdflib>=3.0"]
 
 [project.optional-dependencies]
 dev = [