May 28, 2020 · Feb 29, 2020 · May 24, 2020
diff --git a/CHANGES.rst b/CHANGES.rst
 Change Log
 ----------

 1.1
 ~~~

 UNRELEASED

 Breaking changes:

 * Drop support for Python 3.3. (#358)
 * Drop support for Python 3.4. (#421)

 Other changes:

 * Try to import from `collections.abc` to remove DeprecationWarning and ensure
  `html5lib` keeps working in future Python versions. (#403)
 * Drop optional `datrie` dependency. (#442)


 1.0.1
 ~~~~~

diff --git a/README.rst b/README.rst
 The following third-party libraries may be used for additional
 functionality:

 - ``datrie`` can be used under CPython to improve parsing performance
  (though in almost all cases the improvement is marginal);

 - ``lxml`` is supported as a tree format (for both building and
  walking) under CPython (but *not* PyPy where it is known to cause
  segfaults);
diff --git a/debug-info.py b/debug-info.py
    "maxsize": sys.maxsize
 }

 search_modules = ["chardet", "datrie", "genshi", "html5lib", "lxml", "six"]
 search_modules = ["chardet", "genshi", "html5lib", "lxml", "six"]
 found_modules = []

 for m in search_modules:
diff --git a/html5lib/_trie/__init__.py b/html5lib/_trie/__init__.py
 from __future__ import absolute_import, division, unicode_literals

 from .py import Trie as PyTrie
 from .py import Trie

 Trie = PyTrie

 # pylint:disable=wrong-import-position
 try:
    from .datrie import Trie as DATrie
 except ImportError:
    pass
 else:
    Trie = DATrie
 # pylint:enable=wrong-import-position
 __all__ = ["Trie"]
diff --git a/html5lib/_trie/datrie.py b/html5lib/_trie/datrie.py
diff --git a/requirements-optional.txt b/requirements-optional.txt
 # lxml is supported with its own treebuilder ("lxml") and otherwise
 # uses the standard ElementTree support
 lxml ; platform_python_implementation == 'CPython'

 # DATrie can be used in place of our Python trie implementation for
 # slightly better parsing performance.
 # https://github.com/pytries/datrie/issues/52 although closed is not
 # yet released to https://pypi.org/project/datrie
 datrie ; platform_python_implementation == 'CPython' and python_version < '3.7'
diff --git a/setup.py b/setup.py
      extras_require={
          # A conditional extra will only install these items when the extra is
          # requested and the condition matches.
          "datrie:platform_python_implementation == 'CPython'": ["datrie"],
          "lxml:platform_python_implementation == 'CPython'": ["lxml"],

          # Standard extras, will be installed when the extra is requested.
          # extra that will be installed whenever the condition matches and the
          # all extra is requested.
          "all": ["genshi", "chardet>=2.2"],
          "all:platform_python_implementation == 'CPython'": ["datrie", "lxml"],
          "all:platform_python_implementation == 'CPython'": ["lxml"],
      },
      )
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,23 @@
		Change Log
		----------

		1.1
		~~~

		UNRELEASED

		Breaking changes:

		* Drop support for Python 3.3. (#358)
		* Drop support for Python 3.4. (#421)

		Other changes:

		* Try to import from `collections.abc` to remove DeprecationWarning and ensure
		`html5lib` keeps working in future Python versions. (#403)
		* Drop optional `datrie` dependency. (#442)


		1.0.1
		~~~~~

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -107,9 +107,6 @@ Optional Dependencies
		The following third-party libraries may be used for additional
		functionality:

		- ``datrie`` can be used under CPython to improve parsing performance
		(though in almost all cases the improvement is marginal);

		- ``lxml`` is supported as a tree format (for both building and
		walking) under CPython (but not PyPy where it is known to cause
		segfaults);
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,7 +12,7 @@
		"maxsize": sys.maxsize
		}

		search_modules = ["chardet", "datrie", "genshi", "html5lib", "lxml", "six"]
		search_modules = ["chardet", "genshi", "html5lib", "lxml", "six"]
		found_modules = []

		for m in search_modules:
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,14 +1,5 @@
		from __future__ import absolute_import, division, unicode_literals

		from .py import Trie as PyTrie
		from .py import Trie

		Trie = PyTrie

		# pylint:disable=wrong-import-position
		try:
		from .datrie import Trie as DATrie
		except ImportError:
		pass
		else:
		Trie = DATrie
		# pylint:enable=wrong-import-position
		__all__ = ["Trie"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,9 +11,3 @@ chardet>=2.2
		# lxml is supported with its own treebuilder ("lxml") and otherwise
		# uses the standard ElementTree support
		lxml ; platform_python_implementation == 'CPython'

		# DATrie can be used in place of our Python trie implementation for
		# slightly better parsing performance.
		# https://github.com/pytries/datrie/issues/52 although closed is not
		# yet released to https://pypi.org/project/datrie
		datrie ; platform_python_implementation == 'CPython' and python_version < '3.7'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -111,7 +111,6 @@ def default_environment():
		extras_require={
		# A conditional extra will only install these items when the extra is
		# requested and the condition matches.
		"datrie:platform_python_implementation == 'CPython'": ["datrie"],
		"lxml:platform_python_implementation == 'CPython'": ["lxml"],

		# Standard extras, will be installed when the extra is requested.
Expand All		@@ -123,6 +122,6 @@ def default_environment():
		# extra that will be installed whenever the condition matches and the
		# all extra is requested.
		"all": ["genshi", "chardet>=2.2"],
		"all:platform_python_implementation == 'CPython'": ["datrie", "lxml"],
		"all:platform_python_implementation == 'CPython'": ["lxml"],
		},
		)