jquast · tucked · May 14, 2026 · May 14, 2026
diff --git a/docs/conf.py b/docs/conf.py
@@ -19,7 +19,7 @@
 
 # this path insert is needed for readthedocs.org (only)
 sys.path.insert(
-    0, os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir))
+    0, os.path.abspath(os.path.join(os.path.dirname(__file__), os.path.pardir, "src"))
 )
 
 suppress_warnings = ["image.nonlocal_uri", "ref.class"]

diff --git a/pyproject.toml b/pyproject.toml
@@ -73,7 +73,7 @@ Issues = "https://github.com/jquast/telnetlib3/issues"
 
 [tool.hatch.build.targets.sdist]
 include = [
-    "/telnetlib3/**",
+    "/src/**",
     "/docs/**",
     "/README.rst",
     "/CONTRIBUTING.rst",
@@ -85,7 +85,7 @@ include = [
 ]
 
 [tool.hatch.build.targets.wheel]
-packages = ["telnetlib3"]
+packages = ["src/telnetlib.py", "src/telnetlib3"]
 
 [tool.pylint.main]
 load-plugins = [

diff --git a/src/telnetlib.py b/src/telnetlib.py
@@ -0,0 +1,11 @@
+"""
+Drop-in shim for telnetlib on 3.13+.
+
+On Python 3.12 and earlier, `import telnetlib` should find the module in the standard library, but
+in 3.13+, that standard module is removed. That should cause this shim to be found, which just
+imports the (mostly) unadulterated copy this project vendors.
+"""
+
+# local
+# pylint: disable=wildcard-import,unused-wildcard-import
+from telnetlib3.telnetlib import *  # noqa: F401, F403
diff --git a/telnetlib3/.gitignore → src/telnetlib3/.gitignore b/telnetlib3/.gitignore → src/telnetlib3/.gitignore
diff --git a/telnetlib3/__init__.py → src/telnetlib3/__init__.py b/telnetlib3/__init__.py → src/telnetlib3/__init__.py
diff --git a/telnetlib3/_base.py → src/telnetlib3/_base.py b/telnetlib3/_base.py → src/telnetlib3/_base.py
diff --git a/telnetlib3/_paths.py → src/telnetlib3/_paths.py b/telnetlib3/_paths.py → src/telnetlib3/_paths.py
diff --git a/telnetlib3/_session_context.py → src/telnetlib3/_session_context.py b/telnetlib3/_session_context.py → src/telnetlib3/_session_context.py
diff --git a/telnetlib3/_types.py → src/telnetlib3/_types.py b/telnetlib3/_types.py → src/telnetlib3/_types.py
diff --git a/telnetlib3/accessories.py → src/telnetlib3/accessories.py b/telnetlib3/accessories.py → src/telnetlib3/accessories.py
diff --git a/telnetlib3/client.py → src/telnetlib3/client.py b/telnetlib3/client.py → src/telnetlib3/client.py
diff --git a/telnetlib3/client_base.py → src/telnetlib3/client_base.py b/telnetlib3/client_base.py → src/telnetlib3/client_base.py
diff --git a/telnetlib3/client_shell.py → src/telnetlib3/client_shell.py b/telnetlib3/client_shell.py → src/telnetlib3/client_shell.py
diff --git a/telnetlib3/client_shell_win32.py → src/telnetlib3/client_shell_win32.py b/telnetlib3/client_shell_win32.py → src/telnetlib3/client_shell_win32.py
diff --git a/telnetlib3/encodings/__init__.py → src/telnetlib3/encodings/__init__.py b/telnetlib3/encodings/__init__.py → src/telnetlib3/encodings/__init__.py
diff --git a/telnetlib3/encodings/atarist.py → src/telnetlib3/encodings/atarist.py b/telnetlib3/encodings/atarist.py → src/telnetlib3/encodings/atarist.py
diff --git a/telnetlib3/encodings/atascii.py → src/telnetlib3/encodings/atascii.py b/telnetlib3/encodings/atascii.py → src/telnetlib3/encodings/atascii.py
diff --git a/telnetlib3/encodings/big5bbs.py → src/telnetlib3/encodings/big5bbs.py b/telnetlib3/encodings/big5bbs.py → src/telnetlib3/encodings/big5bbs.py
diff --git a/telnetlib3/encodings/petscii.py → src/telnetlib3/encodings/petscii.py b/telnetlib3/encodings/petscii.py → src/telnetlib3/encodings/petscii.py
diff --git a/telnetlib3/fingerprinting.py → src/telnetlib3/fingerprinting.py b/telnetlib3/fingerprinting.py → src/telnetlib3/fingerprinting.py
diff --git a/telnetlib3/fingerprinting_display.py → src/telnetlib3/fingerprinting_display.py b/telnetlib3/fingerprinting_display.py → src/telnetlib3/fingerprinting_display.py
diff --git a/telnetlib3/guard_shells.py → src/telnetlib3/guard_shells.py b/telnetlib3/guard_shells.py → src/telnetlib3/guard_shells.py
diff --git a/telnetlib3/mud.py → src/telnetlib3/mud.py b/telnetlib3/mud.py → src/telnetlib3/mud.py
diff --git a/telnetlib3/py.typed → src/telnetlib3/py.typed b/telnetlib3/py.typed → src/telnetlib3/py.typed
diff --git a/telnetlib3/relay_server.py → src/telnetlib3/relay_server.py b/telnetlib3/relay_server.py → src/telnetlib3/relay_server.py
diff --git a/telnetlib3/server.py → src/telnetlib3/server.py b/telnetlib3/server.py → src/telnetlib3/server.py
diff --git a/telnetlib3/server_base.py → src/telnetlib3/server_base.py b/telnetlib3/server_base.py → src/telnetlib3/server_base.py
diff --git a/telnetlib3/server_fingerprinting.py → src/telnetlib3/server_fingerprinting.py b/telnetlib3/server_fingerprinting.py → src/telnetlib3/server_fingerprinting.py
diff --git a/telnetlib3/server_pty_shell.py → src/telnetlib3/server_pty_shell.py b/telnetlib3/server_pty_shell.py → src/telnetlib3/server_pty_shell.py
diff --git a/telnetlib3/server_shell.py → src/telnetlib3/server_shell.py b/telnetlib3/server_shell.py → src/telnetlib3/server_shell.py
diff --git a/telnetlib3/slc.py → src/telnetlib3/slc.py b/telnetlib3/slc.py → src/telnetlib3/slc.py
diff --git a/telnetlib3/stream_reader.py → src/telnetlib3/stream_reader.py b/telnetlib3/stream_reader.py → src/telnetlib3/stream_reader.py
diff --git a/telnetlib3/stream_writer.py → src/telnetlib3/stream_writer.py b/telnetlib3/stream_writer.py → src/telnetlib3/stream_writer.py
diff --git a/telnetlib3/sync.py → src/telnetlib3/sync.py b/telnetlib3/sync.py → src/telnetlib3/sync.py
diff --git a/telnetlib3/telnetlib.py → src/telnetlib3/telnetlib.py b/telnetlib3/telnetlib.py → src/telnetlib3/telnetlib.py
diff --git a/telnetlib3/telopt.py → src/telnetlib3/telopt.py b/telnetlib3/telopt.py → src/telnetlib3/telopt.py
diff --git a/telnetlib3/tests/accessories.py → src/telnetlib3/tests/accessories.py b/telnetlib3/tests/accessories.py → src/telnetlib3/tests/accessories.py
@@ -26,7 +26,7 @@ def init_subproc_coverage(run_note=None):
     except ImportError:
         return None
 
-    coveragerc = os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, "tox.ini")
+    coveragerc = os.path.join(os.path.dirname(__file__), os.pardir, os.pardir, os.pardir, "tox.ini")
     cov = coverage.Coverage(config_file=coveragerc)
     cov.start()
     return cov

diff --git a/telnetlib3/tests/conftest.py → src/telnetlib3/tests/conftest.py b/telnetlib3/tests/conftest.py → src/telnetlib3/tests/conftest.py
diff --git a/telnetlib3/tests/pty_helper.py → src/telnetlib3/tests/pty_helper.py b/telnetlib3/tests/pty_helper.py → src/telnetlib3/tests/pty_helper.py
diff --git a/telnetlib3/tests/test_accessories.py → src/telnetlib3/tests/test_accessories.py b/telnetlib3/tests/test_accessories.py → src/telnetlib3/tests/test_accessories.py
diff --git a/telnetlib3/tests/test_accessories_extra.py → ...elnetlib3/tests/test_accessories_extra.py b/telnetlib3/tests/test_accessories_extra.py → ...elnetlib3/tests/test_accessories_extra.py
diff --git a/telnetlib3/tests/test_atascii_codec.py → src/telnetlib3/tests/test_atascii_codec.py b/telnetlib3/tests/test_atascii_codec.py → src/telnetlib3/tests/test_atascii_codec.py
diff --git a/telnetlib3/tests/test_benchmarks.py → src/telnetlib3/tests/test_benchmarks.py b/telnetlib3/tests/test_benchmarks.py → src/telnetlib3/tests/test_benchmarks.py
diff --git a/telnetlib3/tests/test_big5bbs_codec.py → src/telnetlib3/tests/test_big5bbs_codec.py b/telnetlib3/tests/test_big5bbs_codec.py → src/telnetlib3/tests/test_big5bbs_codec.py
diff --git a/telnetlib3/tests/test_charset.py → src/telnetlib3/tests/test_charset.py b/telnetlib3/tests/test_charset.py → src/telnetlib3/tests/test_charset.py
diff --git a/telnetlib3/tests/test_client_shell.py → src/telnetlib3/tests/test_client_shell.py b/telnetlib3/tests/test_client_shell.py → src/telnetlib3/tests/test_client_shell.py
diff --git a/telnetlib3/tests/test_client_shell_win32.py → ...lnetlib3/tests/test_client_shell_win32.py b/telnetlib3/tests/test_client_shell_win32.py → ...lnetlib3/tests/test_client_shell_win32.py
diff --git a/telnetlib3/tests/test_client_unit.py → src/telnetlib3/tests/test_client_unit.py b/telnetlib3/tests/test_client_unit.py → src/telnetlib3/tests/test_client_unit.py
diff --git a/telnetlib3/tests/test_core.py → src/telnetlib3/tests/test_core.py b/telnetlib3/tests/test_core.py → src/telnetlib3/tests/test_core.py
diff --git a/telnetlib3/tests/test_encoding.py → src/telnetlib3/tests/test_encoding.py b/telnetlib3/tests/test_encoding.py → src/telnetlib3/tests/test_encoding.py
diff --git a/telnetlib3/tests/test_environ.py → src/telnetlib3/tests/test_environ.py b/telnetlib3/tests/test_environ.py → src/telnetlib3/tests/test_environ.py
diff --git a/telnetlib3/tests/test_fingerprinting.py → src/telnetlib3/tests/test_fingerprinting.py b/telnetlib3/tests/test_fingerprinting.py → src/telnetlib3/tests/test_fingerprinting.py
diff --git a/telnetlib3/tests/test_guard_integration.py → ...elnetlib3/tests/test_guard_integration.py b/telnetlib3/tests/test_guard_integration.py → ...elnetlib3/tests/test_guard_integration.py
diff --git a/telnetlib3/tests/test_linemode.py → src/telnetlib3/tests/test_linemode.py b/telnetlib3/tests/test_linemode.py → src/telnetlib3/tests/test_linemode.py
diff --git a/telnetlib3/tests/test_mccp.py → src/telnetlib3/tests/test_mccp.py b/telnetlib3/tests/test_mccp.py → src/telnetlib3/tests/test_mccp.py
diff --git a/telnetlib3/tests/test_mud.py → src/telnetlib3/tests/test_mud.py b/telnetlib3/tests/test_mud.py → src/telnetlib3/tests/test_mud.py
diff --git a/telnetlib3/tests/test_mud_negotiation.py → src/telnetlib3/tests/test_mud_negotiation.py b/telnetlib3/tests/test_mud_negotiation.py → src/telnetlib3/tests/test_mud_negotiation.py
diff --git a/telnetlib3/tests/test_naws.py → src/telnetlib3/tests/test_naws.py b/telnetlib3/tests/test_naws.py → src/telnetlib3/tests/test_naws.py
diff --git a/telnetlib3/tests/test_petscii_codec.py → src/telnetlib3/tests/test_petscii_codec.py b/telnetlib3/tests/test_petscii_codec.py → src/telnetlib3/tests/test_petscii_codec.py
diff --git a/telnetlib3/tests/test_pty_shell.py → src/telnetlib3/tests/test_pty_shell.py b/telnetlib3/tests/test_pty_shell.py → src/telnetlib3/tests/test_pty_shell.py
diff --git a/telnetlib3/tests/test_reader.py → src/telnetlib3/tests/test_reader.py b/telnetlib3/tests/test_reader.py → src/telnetlib3/tests/test_reader.py
diff --git a/telnetlib3/tests/test_relay_server.py → src/telnetlib3/tests/test_relay_server.py b/telnetlib3/tests/test_relay_server.py → src/telnetlib3/tests/test_relay_server.py
diff --git a/telnetlib3/tests/test_server.py → src/telnetlib3/tests/test_server.py b/telnetlib3/tests/test_server.py → src/telnetlib3/tests/test_server.py
diff --git a/telnetlib3/tests/test_server_api.py → src/telnetlib3/tests/test_server_api.py b/telnetlib3/tests/test_server_api.py → src/telnetlib3/tests/test_server_api.py
diff --git a/telnetlib3/tests/test_server_cli.py → src/telnetlib3/tests/test_server_cli.py b/telnetlib3/tests/test_server_cli.py → src/telnetlib3/tests/test_server_cli.py
diff --git a/...tlib3/tests/test_server_fingerprinting.py → ...tlib3/tests/test_server_fingerprinting.py b/...tlib3/tests/test_server_fingerprinting.py → ...tlib3/tests/test_server_fingerprinting.py
diff --git a/telnetlib3/tests/test_server_mud.py → src/telnetlib3/tests/test_server_mud.py b/telnetlib3/tests/test_server_mud.py → src/telnetlib3/tests/test_server_mud.py
@@ -7,7 +7,7 @@
 # 3rd party
 import pytest
 
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "bin"))
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "bin"))
 # 3rd party
 import server_mud as mud
 

diff --git a/telnetlib3/tests/test_server_shell_unit.py → ...elnetlib3/tests/test_server_shell_unit.py b/telnetlib3/tests/test_server_shell_unit.py → ...elnetlib3/tests/test_server_shell_unit.py
diff --git a/telnetlib3/tests/test_shell.py → src/telnetlib3/tests/test_shell.py b/telnetlib3/tests/test_shell.py → src/telnetlib3/tests/test_shell.py
diff --git a/telnetlib3/tests/test_slc.py → src/telnetlib3/tests/test_slc.py b/telnetlib3/tests/test_slc.py → src/telnetlib3/tests/test_slc.py
diff --git a/telnetlib3/tests/test_status_logger.py → src/telnetlib3/tests/test_status_logger.py b/telnetlib3/tests/test_status_logger.py → src/telnetlib3/tests/test_status_logger.py
diff --git a/telnetlib3/tests/test_stream_reader_extra.py → ...netlib3/tests/test_stream_reader_extra.py b/telnetlib3/tests/test_stream_reader_extra.py → ...netlib3/tests/test_stream_reader_extra.py
diff --git a/telnetlib3/tests/test_stream_writer_full.py → ...lnetlib3/tests/test_stream_writer_full.py b/telnetlib3/tests/test_stream_writer_full.py → ...lnetlib3/tests/test_stream_writer_full.py
diff --git a/telnetlib3/tests/test_sync.py → src/telnetlib3/tests/test_sync.py b/telnetlib3/tests/test_sync.py → src/telnetlib3/tests/test_sync.py
diff --git a/telnetlib3/tests/test_telnetlib.py → src/telnetlib3/tests/test_telnetlib.py b/telnetlib3/tests/test_telnetlib.py → src/telnetlib3/tests/test_telnetlib.py
@@ -3,8 +3,11 @@
 # std imports
 import io
 import re
+import sys
 import socket
 import selectors
+import sysconfig
+import telnetlib as telnetlib_  # pylint: disable=deprecated-module
 import threading
 import contextlib
 
@@ -445,3 +448,10 @@ def test_expect(_mock_selector):
     telnet = make_telnet(want)
     _, _, data = telnet.expect([b"match"])
     assert data == b"".join(want[:-1])
+
+
+def test_drop_in_support():
+    """Ensure `import telnetlib` works in Python 3.13+."""
+    telnetlib_in_stdlib = sys.version_info < (3, 13)
+    telnetlib_is_stdlib = telnetlib_.__file__.startswith(sysconfig.get_path("stdlib"))
+    assert telnetlib_is_stdlib == telnetlib_in_stdlib
diff --git a/telnetlib3/tests/test_timeout.py → src/telnetlib3/tests/test_timeout.py b/telnetlib3/tests/test_timeout.py → src/telnetlib3/tests/test_timeout.py
diff --git a/telnetlib3/tests/test_tls.py → src/telnetlib3/tests/test_tls.py b/telnetlib3/tests/test_tls.py → src/telnetlib3/tests/test_tls.py
diff --git a/telnetlib3/tests/test_tspeed.py → src/telnetlib3/tests/test_tspeed.py b/telnetlib3/tests/test_tspeed.py → src/telnetlib3/tests/test_tspeed.py
diff --git a/telnetlib3/tests/test_ttype.py → src/telnetlib3/tests/test_ttype.py b/telnetlib3/tests/test_ttype.py → src/telnetlib3/tests/test_ttype.py
diff --git a/telnetlib3/tests/test_uvloop_integration.py → ...lnetlib3/tests/test_uvloop_integration.py b/telnetlib3/tests/test_uvloop_integration.py → ...lnetlib3/tests/test_uvloop_integration.py
diff --git a/telnetlib3/tests/test_writer.py → src/telnetlib3/tests/test_writer.py b/telnetlib3/tests/test_writer.py → src/telnetlib3/tests/test_writer.py
diff --git a/telnetlib3/tests/test_xdisploc.py → src/telnetlib3/tests/test_xdisploc.py b/telnetlib3/tests/test_xdisploc.py → src/telnetlib3/tests/test_xdisploc.py
diff --git a/tox.ini b/tox.ini
@@ -33,7 +33,7 @@ deps =
     trustme
 usedevelop = True
 commands =
-    pytest {posargs:--strict-markers --verbose --durations=10} telnetlib3/tests
+    pytest {posargs:--strict-markers --verbose --durations=10}
 
 
 
@@ -43,7 +43,7 @@ commands =
 deps =
     black
 commands =
-    black telnetlib3/ bin/
+    black src/ bin/
 
 [testenv:docformatter]
 basepython = python3.13
@@ -57,7 +57,7 @@ commands =
         --pre-summary-newline \
         --wrap-summaries=100 \
         --wrap-descriptions=100 \
-        {toxinidir}/telnetlib3/ \
+        {toxinidir}/src/ \
         {toxinidir}/docs/conf.py
 
 [testenv:docformatter_check]
@@ -73,14 +73,14 @@ commands =
         --pre-summary-newline \
         --wrap-summaries=100 \
         --wrap-descriptions=100 \
-        {toxinidir}/telnetlib3/ \
+        {toxinidir}/src/ \
         {toxinidir}/docs/conf.py
 
 [testenv:flake8]
 deps =
     flake8
 commands =
-    flake8 --exclude=tests telnetlib3/ bin/
+    flake8 --exclude=tests src/ bin/
 
 [testenv:flake8_tests]
 deps =
@@ -89,25 +89,25 @@ commands =
     # F811: pytest fixtures appear as redefinitions
     # E402: imports after conftest fixtures
     # E712: comparison to False in tests is intentional
-    flake8 --ignore=W504,F401,E501,F811,E402,E712,F841,W503,E203 telnetlib3/tests/
+    flake8 --ignore=W504,F401,E501,F811,E402,E712,F841,W503,E203 src/telnetlib3/tests/
 
 [testenv:isort]
 deps =
     isort
 commands =
-    isort telnetlib3 bin
+    isort src bin
 
 [testenv:isort_check]
 deps =
     isort
 commands =
-    isort --diff --check-only telnetlib3 bin
+    isort --diff --check-only src bin
 
 [testenv:mypy]
 deps =
     mypy
 commands =
-    mypy --strict telnetlib3
+    mypy --strict src
 
 [testenv:pydocstyle]
 deps =
@@ -116,7 +116,7 @@ deps =
     doc8
     pygments
 commands =
-    pydocstyle --source --explain {toxinidir}/telnetlib3
+    pydocstyle --source --explain {toxinidir}/src
     rst-lint README.rst
     doc8 --ignore-path docs/_build --ignore D000 docs
 
@@ -126,7 +126,7 @@ deps =
     prettytable
     ucs-detect>=2
 commands =
-    pylint {posargs} telnetlib3 bin --ignore=tests
+    pylint {posargs} src bin --ignore=tests
 
 [testenv:pylint_tests]
 deps =
@@ -145,7 +145,7 @@ commands =
         --disable=unpacking-non-sequence \
         --disable=unused-import \
         --disable=unused-variable \
-        {posargs} telnetlib3/tests
+        {posargs} src/telnetlib3/tests
 
 [testenv:codespell]
 deps =
@@ -201,26 +201,26 @@ commands =
 [coverage:run]
 branch = True
 parallel = True
-source = telnetlib3
-omit = telnetlib3/tests/*
-       telnetlib3/telnetlib.py
-       telnetlib3/_types.py
+source = src/telnetlib3
+omit = src/telnetlib3/tests/*
+       src/telnetlib3/telnetlib.py
+       src/telnetlib3/_types.py
        # Too complex for good coverage, though some tests exists, it
        # is tested by running a public server: telnet 1984.ws 555
-       telnetlib3/fingerprinting_display.py
+       src/telnetlib3/fingerprinting_display.py
 relative_files = True
 
 [coverage:report]
 precision = 1
 exclude_lines =
     pragma: no cover
-omit = telnetlib3/tests/*
-       telnetlib3/telnetlib.py
-       telnetlib3/_types.py
-       telnetlib3/fingerprinting_display.py
+omit = src/telnetlib3/tests/*
+       src/telnetlib3/telnetlib.py
+       src/telnetlib3/_types.py
+       src/telnetlib3/fingerprinting_display.py
 
 [coverage:paths]
-source = telnetlib3/
+source = src/
 
 [doc8]
 max-line-length = 100
@@ -274,10 +274,11 @@ addopts =
     --disable-pytest-warnings
     --ignore=setup.py
     --ignore=.tox
-    --ignore=telnetlib3/tests/test_benchmarks.py
+    --ignore=src/telnetlib3/tests/test_benchmarks.py
     --durations=10
     --timeout=15
     --junit-xml=.tox/results.{envname}.xml
 faulthandler_timeout = 30
 filterwarnings =
 junit_family = xunit1
+testpaths = src/telnetlib3/tests