Skip to content

bpo-39481: PEP 585 for difflib, filecmp, fileinput #19422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Lib/difflib.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

from heapq import nlargest as _nlargest
from collections import namedtuple as _namedtuple
from types import GenericAlias

Match = _namedtuple('Match', 'a b size')

Expand Down Expand Up @@ -685,6 +686,9 @@ def real_quick_ratio(self):
# shorter sequence
return _calculate_ratio(min(la, lb), la + lb)

__class_getitem__ = classmethod(GenericAlias)


def get_close_matches(word, possibilities, n=3, cutoff=0.6):
"""Use SequenceMatcher to return list of the best "good enough" matches.
Expand Down
4 changes: 4 additions & 0 deletions Lib/filecmp.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import os
import stat
from itertools import filterfalse
from types import GenericAlias

__all__ = ['clear_cache', 'cmp', 'dircmp', 'cmpfiles', 'DEFAULT_IGNORES']

Expand Down Expand Up @@ -247,6 +248,9 @@ def __getattr__(self, attr):
self.methodmap[attr](self)
return getattr(self, attr)

__class_getitem__ = classmethod(GenericAlias)


def cmpfiles(a, b, common, shallow=True):
"""Compare common files in two directories.
Expand Down
3 changes: 3 additions & 0 deletions Lib/fileinput.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"""

import sys, os
from types import GenericAlias

__all__ = ["input", "close", "nextfile", "filename", "lineno", "filelineno",
"fileno", "isfirstline", "isstdin", "FileInput", "hook_compressed",
Expand Down Expand Up @@ -391,6 +392,8 @@ def isfirstline(self):
def isstdin(self):
return self._isstdin

__class_getitem__ = classmethod(GenericAlias)


def hook_compressed(filename, mode):
ext = os.path.splitext(filename)[1]
Expand Down
6 changes: 6 additions & 0 deletions Lib/test/test_genericalias.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
)
from collections.abc import *
from contextlib import AbstractContextManager, AbstractAsyncContextManager
from difflib import SequenceMatcher
from filecmp import dircmp
from fileinput import FileInput
from mmap import mmap
from ipaddress import IPv4Network, IPv4Interface, IPv6Network, IPv6Interface
from itertools import chain
Expand All @@ -25,6 +28,9 @@ def test_subscriptable(self):
for t in (type, tuple, list, dict, set, frozenset, enumerate,
mmap,
defaultdict, deque,
SequenceMatcher,
dircmp,
FileInput,
OrderedDict, Counter, UserDict, UserList,
Pattern, Match,
AbstractContextManager, AbstractAsyncContextManager,
Expand Down