From c4f666508da002619445037b9aadecfc12ac1be9 Mon Sep 17 00:00:00 2001
From: E-Paine <63801254+E-Paine@users.noreply.github.com>
Date: Sat, 22 May 2021 13:09:54 +0100
Subject: [PATCH 1/2] [3.10] Remove effbot urls (GH-26308). (cherry picked from
commit e9f66aedf44ccc3be27975cfb070a44ce6a6bd13)
Co-authored-by: E-Paine <63801254+E-Paine@users.noreply.github.com>
---
Doc/about.rst | 5 ++---
Doc/faq/library.rst | 3 ---
Doc/howto/curses.rst | 6 +-----
Doc/library/tkinter.rst | 3 +++
Doc/library/xml.etree.elementtree.rst | 7 -------
Doc/library/xmlrpc.client.rst | 6 ------
Lib/xml/etree/ElementPath.py | 1 -
Objects/stringlib/fastsearch.h | 3 ++-
8 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/Doc/about.rst b/Doc/about.rst
index 3ea311fa629dd2..f0b908487b2d09 100644
--- a/Doc/about.rst
+++ b/Doc/about.rst
@@ -23,9 +23,8 @@ Many thanks go to:
and writer of much of the content;
* the `Docutils `_ project for creating
reStructuredText and the Docutils suite;
-* Fredrik Lundh for his `Alternative Python Reference
- `_ project from which Sphinx got many good
- ideas.
+* Fredrik Lundh for his Alternative Python Reference project from which Sphinx
+ got many good ideas.
Contributors to the Python Documentation
diff --git a/Doc/faq/library.rst b/Doc/faq/library.rst
index faca834e965455..b9e541c150dc43 100644
--- a/Doc/faq/library.rst
+++ b/Doc/faq/library.rst
@@ -106,9 +106,6 @@ support, pads, and mouse support. This means the module isn't compatible with
operating systems that only have BSD curses, but there don't seem to be any
currently maintained OSes that fall into this category.
-For Windows: use `the consolelib module
-`_.
-
Is there an equivalent to C's onexit() in Python?
-------------------------------------------------
diff --git a/Doc/howto/curses.rst b/Doc/howto/curses.rst
index cc4b4785b12290..c0149ffff37716 100644
--- a/Doc/howto/curses.rst
+++ b/Doc/howto/curses.rst
@@ -55,11 +55,7 @@ everything, though.
The Windows version of Python doesn't include the :mod:`curses`
module. A ported version called `UniCurses
-`_ is available. You could
-also try `the Console module `_
-written by Fredrik Lundh, which doesn't
-use the same API as curses but provides cursor-addressable text output
-and full support for mouse and keyboard input.
+`_ is available.
The Python curses module
diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 65395d824cab76..34decd562ff469 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -55,6 +55,9 @@ details that are unchanged.
Books:
+ `Programming Python `_
+ Book by Mark Lutz, has excellent coverage of Tkinter.
+
* `Modern Tkinter for Busy Python Developers `_
By Mark Roseman. (ISBN 978-1999149567)
diff --git a/Doc/library/xml.etree.elementtree.rst b/Doc/library/xml.etree.elementtree.rst
index 87f4ee347d604d..e3932bc9e659fe 100644
--- a/Doc/library/xml.etree.elementtree.rst
+++ b/Doc/library/xml.etree.elementtree.rst
@@ -363,13 +363,6 @@ These two approaches both output::
|--> Commander Clement
-Additional resources
-^^^^^^^^^^^^^^^^^^^^
-
-See http://effbot.org/zone/element-index.htm for tutorials and links to other
-docs.
-
-
.. _elementtree-xpath:
XPath support
diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst
index 51279b35fd71b7..8d9db53ef1f0da 100644
--- a/Doc/library/xmlrpc.client.rst
+++ b/Doc/library/xmlrpc.client.rst
@@ -169,12 +169,6 @@ between conformable Python objects and XML on the wire.
`XML-RPC Specification `_
The official specification.
- `Unofficial XML-RPC Errata `_
- Fredrik Lundh's "unofficial errata, intended to clarify certain
- details in the XML-RPC specification, as well as hint at
- 'best practices' to use when designing your own XML-RPC
- implementations."
-
.. _serverproxy-objects:
ServerProxy Objects
diff --git a/Lib/xml/etree/ElementPath.py b/Lib/xml/etree/ElementPath.py
index a1170b572feea0..cd3c354d0813ee 100644
--- a/Lib/xml/etree/ElementPath.py
+++ b/Lib/xml/etree/ElementPath.py
@@ -226,7 +226,6 @@ def select(context, result):
def prepare_predicate(next, token):
# FIXME: replace with real parser!!! refs:
- # http://effbot.org/zone/simple-iterator-parser.htm
# http://javascript.crockford.com/tdop/tdop.html
signature = []
predicate = []
diff --git a/Objects/stringlib/fastsearch.h b/Objects/stringlib/fastsearch.h
index 6574720b609f4c..7b8be5d6492157 100644
--- a/Objects/stringlib/fastsearch.h
+++ b/Objects/stringlib/fastsearch.h
@@ -4,7 +4,8 @@
/* fast search/count implementation, based on a mix between boyer-
moore and horspool, with a few more bells and whistles on the top.
- for some more background, see: http://effbot.org/zone/stringlib.htm */
+ for some more background, see:
+ https://web.archive.org/web/20201107074620/http://effbot.org/zone/stringlib.htm */
/* note: fastsearch may access s[n], which isn't a problem when using
Python's ordinary string types, but may cause problems if you're
From 3efed5fd5ce7716e25d2acc2e17dcb6878c83997 Mon Sep 17 00:00:00 2001
From: Thaddeus1499 <104600742+Thaddeus1499@users.noreply.github.com>
Date: Mon, 2 May 2022 12:09:14 -0400
Subject: [PATCH 2/2] Update tkinter.rst
removed duplicate book link
---
Doc/library/tkinter.rst | 3 ---
1 file changed, 3 deletions(-)
diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 34decd562ff469..65395d824cab76 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -55,9 +55,6 @@ details that are unchanged.
Books:
- `Programming Python `_
- Book by Mark Lutz, has excellent coverage of Tkinter.
-
* `Modern Tkinter for Busy Python Developers `_
By Mark Roseman. (ISBN 978-1999149567)