From 9ebd0cccd278aeeb05ce2ebfa48a031384dbb8dd Mon Sep 17 00:00:00 2001 From: Jonathan Guyer Date: Thu, 22 Feb 2024 09:14:35 -0500 Subject: [PATCH] Remove future.standard_library This library no longer exists in Python 3.12 It looks like it isn't even needed in Python 2.7 to use pickle and redirecting_html.py should go away (but fixed it anyway). --- docs/source/sphinxext/redirecting_html.py | 10 +++++----- fipy/tools/dump.py | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/docs/source/sphinxext/redirecting_html.py b/docs/source/sphinxext/redirecting_html.py index 7b779ed24b..0f8280c91d 100644 --- a/docs/source/sphinxext/redirecting_html.py +++ b/docs/source/sphinxext/redirecting_html.py @@ -1,9 +1,9 @@ from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() from docutils import nodes -import urllib.parse - +try: + from urllib.parse import urlparse +except ImportError: + from urlparse import urlparse from sphinx.builders.html import StandaloneHTMLBuilder class RedirectingHTMLBuilder(StandaloneHTMLBuilder): @@ -17,7 +17,7 @@ def write_doc(self, docname, doctree): for node in doctree.traverse(nodes.reference): try: uri = node['refuri'] - uri = urllib.parse.urlparse(uri) + uri = urlparse(uri) if uri.scheme in ["http", "https"]: if not uri.netloc.endswith("nist.gov"): node['refuri'] = "/cgi-bin/redirect.py?url=" + uri.geturl() diff --git a/fipy/tools/dump.py b/fipy/tools/dump.py index b2398c0df7..a7f0b2c199 100644 --- a/fipy/tools/dump.py +++ b/fipy/tools/dump.py @@ -1,6 +1,4 @@ from __future__ import unicode_literals -from future import standard_library -standard_library.install_aliases() __docformat__ = 'restructuredtext' import io