updates 2

.gitignore

@@ -8,3 +8,4 @@ dist/
 *.egg-info/
 *.pyc
 *.pyo
+emeraldtree/_version.py

README.rst

@@ -16,8 +16,6 @@ please see the repositories:
 * https://github.com/moinwiki/emeraldtree/
 * http://svn.effbot.org/public/elementtree-1.3/
 
-Please note: EmeraldTree works with Python 2.7 or >=3.4.
-
 Changes are (c) by their authors (see also source files) and licensed
 under the same Python (MIT style) license as ElementTree (see below):
 

emeraldtree/ElementInclude.py

@@ -109,7 +109,7 @@ def include(elem, loader=None):
                 node = loader(href, parse)
                 if node is None:
                     raise FatalIncludeError(
-                        "cannot load %r as %r" % (href, parse)
+                        "cannot load {!r} as {!r}".format(href, parse)
                         )
                 node = copy.copy(node)
                 if e.tail:
@@ -119,7 +119,7 @@ def include(elem, loader=None):
                 text = loader(href, parse, e.get("encoding"))
                 if text is None:
                     raise FatalIncludeError(
-                        "cannot load %r as %r" % (href, parse)
+                        "cannot load {!r} as {!r}".format(href, parse)
                         )
                 if i:
                     node = elem[i-1]

emeraldtree/ElementPath.py

@@ -77,14 +77,12 @@ def select(context, result):
 def prepare_star(next, token):
     def select(context, result):
         for elem in result:
-            for e in elem:
-                yield e
+            yield from elem
     return select
 
 def prepare_dot(next, token):
     def select(context, result):
-        for elem in result:
-            yield elem
+        yield from result
     return select
 
 def prepare_iter(next, token):

emeraldtree/html.py

@@ -31,14 +31,11 @@
 # Tools to build element trees from HTML files.
 ##
 
-import six
-from six.moves import html_entities
-from six.moves import html_parser
+from html.parser import HTMLParser as HTMLParserBase
+from html.entities import entitydefs as html_entitydefs
 
 from . import tree
 
-HTMLParserBase = html_parser.HTMLParser
-
 
 ##
 # ElementTree builder for HTML source code.  This builder converts an
@@ -148,7 +145,7 @@ def handle_charref(self, char):
     # (Internal) Handles entity references.
 
     def handle_entityref(self, name):
-        entity = html_entities.entitydefs.get(name)
+        entity = html_entitydefs.get(name)
         if entity:
             if len(entity) == 1:
                 entity = ord(entity)
@@ -165,7 +162,7 @@ def handle_entityref(self, name):
     # (Internal) Handles character data.
 
     def handle_data(self, data):
-        if isinstance(data, six.binary_type):
+        if isinstance(data, bytes):
             # convert to unicode, but only if necessary
             data = data.decode(self.encoding, "ignore")
         self.__builder.data(data)

emeraldtree/tests/test_html.py

@@ -1,5 +1,4 @@
-import six
-from six import StringIO
+from io import StringIO
 
 from .. import html, tree
 
@@ -26,7 +25,7 @@ def test_read_text1():
     assert isinstance(elem, tree.Element)
     assert len(elem) == 1
     assert elem[0] == 'b'
-    assert isinstance(elem[0], six.text_type)
+    assert isinstance(elem[0], str)
 
 def test_read_text2():
     elem = html.HTML('<a>b<c>d</c>d</a>')