From 9a8cc74c4bdb9f2df4103c70d21a37f2636c1bb9 Mon Sep 17 00:00:00 2001
From: Noorhteen Raja NJ <jnoortheen@gmail.com>
Date: Tue, 30 Nov 2021 18:52:31 +0530
Subject: [PATCH] refactor: remove xonsh.ptk2 module (#4570)

---
 news/remove-ptk2.rst       | 23 ++++++++++++++++++++++
 setup.py                   |  1 -
 tests/test_ptk_history.py  | 40 --------------------------------------
 xonsh/ptk2/__init__.py     |  1 -
 xonsh/ptk2/completer.py    |  1 -
 xonsh/ptk2/history.py      |  1 -
 xonsh/ptk2/key_bindings.py |  1 -
 xonsh/ptk2/shell.py        |  1 -
 8 files changed, 23 insertions(+), 46 deletions(-)
 create mode 100644 news/remove-ptk2.rst
 delete mode 100644 xonsh/ptk2/__init__.py
 delete mode 100644 xonsh/ptk2/completer.py
 delete mode 100644 xonsh/ptk2/history.py
 delete mode 100644 xonsh/ptk2/key_bindings.py
 delete mode 100644 xonsh/ptk2/shell.py

diff --git a/news/remove-ptk2.rst b/news/remove-ptk2.rst
new file mode 100644
index 000000000..03ee73e91
--- /dev/null
+++ b/news/remove-ptk2.rst
@@ -0,0 +1,23 @@
+**Added:**
+
+* <news item>
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* Removed ``xonsh.ptk2`` module whcih was kept for some old packages sake. Now xonsh requires atleast ptk3 version.
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>
diff --git a/setup.py b/setup.py
index fe8ff139e..2ab97f39f 100755
--- a/setup.py
+++ b/setup.py
@@ -319,7 +319,6 @@ def main():
             "xonsh",
             "xonsh.ply.ply",
             "xonsh.ptk_shell",
-            "xonsh.ptk2",
             "xonsh.procs",
             "xonsh.parsers",
             "xonsh.xoreutils",
diff --git a/tests/test_ptk_history.py b/tests/test_ptk_history.py
index 98de380d9..e3a974639 100644
--- a/tests/test_ptk_history.py
+++ b/tests/test_ptk_history.py
@@ -20,43 +20,3 @@ def test_obj(history_obj):
     assert ["line10"] == history_obj.get_strings()
     assert len(history_obj) == 1
     assert ["line10"] == [x for x in history_obj]
-
-
-def test_ptk2_backcompat():
-    """
-    Test that legacy code (ahem, xontribs) can still reference xonsh.ptk2 (for a while)
-    """
-
-    import xonsh.ptk_shell.shell as imports_new
-    import xonsh.ptk2.shell as imports_legacy
-
-    # defining the ptk2 package this way leaves out the internal global names (which all start with '_')
-
-    s_new = set(dir(imports_new))
-    s_legacy = set(dir(imports_legacy))
-    extra_names = s_new - s_legacy
-
-    for name in extra_names:
-        assert name.startswith("_")
-
-    assert s_legacy.issubset(s_new)
-
-
-# prove that legacy API is usable
-
-
-@pytest.fixture
-def history_obj_legacy():
-    """Instantiate `PromptToolkitHistory` via legacy alias and append a line string"""
-    from xonsh.ptk2.history import PromptToolkitHistory
-
-    hist = PromptToolkitHistory(load_prev=False)
-    hist.append_string("line10")
-    return hist
-
-
-def test_obj_legacy(history_obj_legacy):
-    history_obj = history_obj_legacy
-    assert ["line10"] == history_obj.get_strings()
-    assert len(history_obj) == 1
-    assert ["line10"] == [x for x in history_obj]
diff --git a/xonsh/ptk2/__init__.py b/xonsh/ptk2/__init__.py
deleted file mode 100644
index 138cadd85..000000000
--- a/xonsh/ptk2/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from xonsh.ptk_shell import *  # noqa: F403 F401
diff --git a/xonsh/ptk2/completer.py b/xonsh/ptk2/completer.py
deleted file mode 100644
index b53bffba7..000000000
--- a/xonsh/ptk2/completer.py
+++ /dev/null
@@ -1 +0,0 @@
-from xonsh.ptk_shell.completer import *  # noqa: F403 F401
diff --git a/xonsh/ptk2/history.py b/xonsh/ptk2/history.py
deleted file mode 100644
index e0209849a..000000000
--- a/xonsh/ptk2/history.py
+++ /dev/null
@@ -1 +0,0 @@
-from xonsh.ptk_shell.history import *  # noqa: F403 F401
diff --git a/xonsh/ptk2/key_bindings.py b/xonsh/ptk2/key_bindings.py
deleted file mode 100644
index ba955b5de..000000000
--- a/xonsh/ptk2/key_bindings.py
+++ /dev/null
@@ -1 +0,0 @@
-from xonsh.ptk_shell.key_bindings import *  # noqa: F403 F401
diff --git a/xonsh/ptk2/shell.py b/xonsh/ptk2/shell.py
deleted file mode 100644
index 7a919abb6..000000000
--- a/xonsh/ptk2/shell.py
+++ /dev/null
@@ -1 +0,0 @@
-from xonsh.ptk_shell.shell import *  # noqa: F403 F401