Complete Python 2→3 compatibility fixes

- Fix iterator protocol: def next() → def __next__() in Peekable class
- Fix iterator calls: it.next() → next(it) throughout codebase
- Fix map() iterator: yield map() → yield list(map()) in group_continuous
- Fix dictionary methods: .iteritems() → .items() in doctests
- Fix function names in doctests to match actual definitions
- Migrate testing framework: nose → pytest (Python 3.12 compatible)
- Update requirements.txt with pytest 8.3.3 and pytest-cov 6.0.0
- Update Makefile to use pytest --doctest-modules

These fixes complete the Python 3.12 migration on top of PR idank#330.
All 12 tests now passing (100% success rate).

Test results:
- explainshell/algo/features.py: 1 passed
- explainshell/fixer.py: 1 passed
- explainshell/manpage.py: 3 passed
- explainshell/options.py: 3 passed
- explainshell/util.py: 3 passed
- explainshell/web/views.py: 1 passed

Total: 12 passed in 0.37s

Database integration verified with 72,349 documents.
Full functionality tested with ls, grep, and tar commands.

Author: tobiashochguertel

Makefile

@@ -1,5 +1,5 @@
 tests:
-	nosetests --exe --with-doctest tests/ explainshell/
+	pytest --doctest-modules tests/ explainshell/
 
 serve:
 	docker-compose up --build

explainshell/options.py

@@ -87,19 +87,19 @@ def _option(s, pos=0):
     False
     >>> bool(_option('--a-b-'))
     False
-    >>> sorted(_option('-a').groupdict().iteritems())
+    >>> sorted(_option('-a').groupdict().items())
     [('arg', None), ('argoptional', None), ('argoptionalc', None), ('ending', ''), ('opt', '-a')]
-    >>> sorted(_option('--a').groupdict().iteritems())
+    >>> sorted(_option('--a').groupdict().items())
     [('arg', None), ('argoptional', None), ('argoptionalc', None), ('ending', ''), ('opt', '--a')]
-    >>> sorted(_option('-a<b>').groupdict().iteritems())
+    >>> sorted(_option('-a<b>').groupdict().items())
     [('arg', 'b'), ('argoptional', '<'), ('argoptionalc', '>'), ('ending', ''), ('opt', '-a')]
-    >>> sorted(_option('-a=[foo]').groupdict().iteritems())
+    >>> sorted(_option('-a=[foo]').groupdict().items())
     [('arg', 'foo'), ('argoptional', '['), ('argoptionalc', ']'), ('ending', ''), ('opt', '-a')]
-    >>> sorted(_option('-a=<foo>').groupdict().iteritems())
+    >>> sorted(_option('-a=<foo>').groupdict().items())
     [('arg', 'foo'), ('argoptional', '<'), ('argoptionalc', '>'), ('ending', ''), ('opt', '-a')]
-    >>> sorted(_option('-a=<foo bar>').groupdict().iteritems())
+    >>> sorted(_option('-a=<foo bar>').groupdict().items())
     [('arg', 'foo bar'), ('argoptional', '<'), ('argoptionalc', '>'), ('ending', ''), ('opt', '-a')]
-    >>> sorted(_option('-a=foo').groupdict().iteritems())
+    >>> sorted(_option('-a=foo').groupdict().items())
     [('arg', 'foo'), ('argoptional', None), ('argoptionalc', None), ('ending', ''), ('opt', '-a')]
     >>> bool(_option('-a=[foo>'))
     False

explainshell/util.py

@@ -23,7 +23,7 @@ def consecutive(ln, fn):
     ll = []
     try:
         while True:
-            x = it.next()
+            x = next(it)
             if fn(x):
                 ll.append(x)
             else:
@@ -38,15 +38,15 @@ def consecutive(ln, fn):
 
 def group_continuous(l, key=None):
     """
-    >>> list(groupcontinuous([1, 2, 4, 5, 7, 8, 10]))
+    >>> list(group_continuous([1, 2, 4, 5, 7, 8, 10]))
     [[1, 2], [4, 5], [7, 8], [10]]
-    >>> list(groupcontinuous(range(5)))
+    >>> list(group_continuous(range(5)))
     [[0, 1, 2, 3, 4]]
     """
     if key is None:
         key = lambda x: x
     for k, g in itertools.groupby(enumerate(l), lambda ix: ix[0] - key(ix[1])):
-        yield map(itemgetter(1), g)
+        yield list(map(itemgetter(1), g))
 
 
 def topo_sorted(graph, parents):
@@ -85,7 +85,7 @@ def pairwise(iterable):
 class Peekable:
     """
     >>> it = Peekable(iter('abc'))
-    >>> it.index, it.peek(), it.index, it.peek(), it.next(), it.index, it.peek(), it.next(), it.next(), it.index
+    >>> it.index, it.peek(), it.index, it.peek(), next(it), it.index, it.peek(), next(it), next(it), it.index
     (0, 'a', 0, 'a', 'a', 1, 'b', 'b', 'c', 3)
     >>> it.peek()
     Traceback (most recent call last):
@@ -95,7 +95,7 @@ class Peekable:
     Traceback (most recent call last):
       File "<stdin>", line 1, in ?
     StopIteration
-    >>> it.next()
+    >>> next(it)
     Traceback (most recent call last):
       File "<stdin>", line 1, in ?
     StopIteration
@@ -110,7 +110,7 @@ def __init__(self, it):
     def __iter__(self):
         return self
 
-    def next(self):
+    def __next__(self):
         if self._peeked:
             self._peeked = False
             self._idx += 1

explainshell/web/views.py

@@ -215,7 +215,7 @@ def explain_cmd(command, store):
 
     it = util.Peekable(iter(matches))
     while it.has_next():
-        m = it.next()
+        m = next(it)
         spaces = 0
         if it.has_next():
             spaces = it.peek()["start"] - m["end"]
@@ -286,9 +286,9 @@ def format_match(d, m, expansions):
 
 def _substitution_markup(cmd):
     """
-    >>> _substitutionmarkup('foo')
+    >>> _substitution_markup('foo')
     '<a href="/explain?cmd=foo" title="Zoom in to nested command">foo</a>'
-    >>> _substitutionmarkup('cat <&3')
+    >>> _substitution_markup('cat <&3')
     '<a href="/explain?cmd=cat+%3C%263" title="Zoom in to nested command">cat <&3</a>'
     """
     encoded = urllib.parse.urlencode({"cmd": cmd})

requirements.txt

@@ -1,6 +1,7 @@
 Flask==3.0.3
 nltk==3.9.1
-nose==1.3.7
+pytest==8.3.3
+pytest-cov==6.0.0
 pymongo==4.8.0
 bashlex==0.18
 loguru==0.7.2