Skip to content

Alternative (simpler) repr for generics #296

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.

Sign up for GitHub

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
gvanrossum merged 8 commits into from
Oct 20, 2016
Merged

Alternative (simpler) repr for generics #296

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
205b4bf
Alternative repr for generics
ilevkivskyi Oct 10, 2016
b42f304
Small fix and tests
ilevkivskyi Oct 10, 2016
e0caaff
Simply code
ilevkivskyi Oct 10, 2016
9d035e3
Code formatting
ilevkivskyi Oct 10, 2016
47bf98f
Reorganize code to take care about Generic[T] and _Protocol[T]
ilevkivskyi Oct 11, 2016
8520984
Remove unnecessary recursion
ilevkivskyi Oct 16, 2016
ff35a80
Add replacement algorithm to Generic
ilevkivskyi Oct 16, 2016
232f80a
Add _subs_repr to other types; fix minor bugs
ilevkivskyi Oct 16, 2016
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
Prev Previous commit
Next Next commit
Remove unnecessary recursion
  • Loading branch information
@ilevkivskyi
ilevkivskyi committed Oct 16, 2016
commit 85209842f046639a09d61cb8b73b055ea3606bb1
18 changes: 13 additions & 5 deletions python2/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,11 +1125,19 @@ def _arg_repr(self):
if not self.__parameters__:
return ''
return par_repr
r = self.__origin__._arg_repr()
for i in range(len(self.__args__)): # replace free parameters with args
par = stdlib_re.escape(_type_repr(self.__origin__.__parameters__[i]))
r = stdlib_re.sub(par + '(?=[,\]])', '{%r}' % i, r)
return r.format(*map(_type_repr, self.__args__))

current = self
orig_chain = []
while current.__origin__ is not None:
orig_chain.append(current)
current = current.__origin__
r = '[%s]' % (', '.join(map(_type_repr, orig_chain[-1].__origin__.__parameters__)))
for tp in reversed(orig_chain):
for i in range(len(tp.__args__)): # replace free parameters with args
par = stdlib_re.escape(_type_repr(tp.__origin__.__parameters__[i]))
r = stdlib_re.sub(par + '(?=[,\]])', '{%r}' % i, r)
r = r.format(*map(_type_repr, tp.__args__))
return r

def __eq__(self, other):
if not isinstance(other, GenericMeta):
Expand Down
36 changes: 22 additions & 14 deletions src/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,10 @@ def _geqv(a, b):
return _gorg(a) is _gorg(b)


def _arg_repr(cls):
return '[%s]' % (', '.join(map(_type_repr, cls.__parameters__)))


def _next_in_mro(cls):
"""Helper for Generic.__new__.

Expand Down Expand Up @@ -1006,21 +1010,25 @@ def _get_type_vars(self, tvars):
_get_type_vars(self.__parameters__, tvars)

def __repr__(self):
return super().__repr__() + self._arg_repr()

def _arg_repr(self):
par_repr = '[%s]' % (', '.join(map(_type_repr, self.__parameters__)))
if self.__origin__ in [Generic, _Protocol]:
return par_repr
r = super().__repr__()
if self.__origin__ is None:
if not self.__parameters__:
return ''
return par_repr
r = self.__origin__._arg_repr()
for i in range(len(self.__args__)): # replace free parameters with args
par = stdlib_re.escape(_type_repr(self.__origin__.__parameters__[i]))
r = stdlib_re.sub(par + '(?=[,\]])', '{%r}' % i, r)
return r.format(*map(_type_repr, self.__args__))
return r
if self.__origin__ in [Generic, _Protocol]:
return r + _arg_repr(self)

current = self
orig_chain = []
while current is not None:
orig_chain.append(current)
current = current.__origin__

ar = _arg_repr(orig_chain.pop())
for cls in reversed(orig_chain):
for i in range(len(cls.__args__)): # replace free parameters with args
par = stdlib_re.escape(_type_repr(cls.__origin__.__parameters__[i]))
ar = stdlib_re.sub(par + '(?=[,\]])', '{%r}' % i, ar)
ar = ar.format(*map(_type_repr, cls.__args__))
return r + ar

def __eq__(self, other):
if not isinstance(other, GenericMeta):
Expand Down