Yaltik/hy
2
0
Fork 0
Code Pull Requests Releases Activity

remove trailing commas in HyDict reprs

Browse Source
This commit is contained in:
gilch 2017-09-18 00:58:14 -06:00
parent af8d209496
commit d38956fb9e
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/language/core.rst
View File

@ -633,7 +633,7 @@ arguments. If the argument list only has one element, return it.
=> (list* 1 10 2 20 '{}) => (list* 1 10 2 20 '{})
HyDict([ HyDict([
HyInteger(1), HyInteger(10), HyInteger(1), HyInteger(10),
HyInteger(2), HyInteger(20),]) HyInteger(2), HyInteger(20)])
=> (list* 1 10 2 20 {}) => (list* 1 10 2 20 {})
<HyCons ( <HyCons (
HyInteger(1) HyInteger(1)

6
hy/models.py
View File

@ -275,14 +275,14 @@ class HyDict(HyList):
for k, v in zip(self[::2],self[1::2]): for k, v in zip(self[::2],self[1::2]):
k, v = repr_indent(k), repr_indent(v) k, v = repr_indent(k), repr_indent(v)
pairs.append( pairs.append(
("{0}{c}\n {1}\n {c}" ("{0}{c}\n {1}\n "
if '\n' in k+v if '\n' in k+v
else "{0}{c} {1}{c}").format(k, v, c=g(','))) else "{0}{c} {1}").format(k, v, c=g(',')))
if len(self) % 2 == 1: if len(self) % 2 == 1:
pairs.append("{} {}\n".format( pairs.append("{} {}\n".format(
repr_indent(self[-1]), g("# odd"))) repr_indent(self[-1]), g("# odd")))
return "{}\n {}{}".format( return "{}\n {}{}".format(
g("HyDict(["), ("\n ".join(pairs)), g("])")) g("HyDict(["), ("{c}\n ".format(c=g(',')).join(pairs)), g("])"))
else: else:
return '' + g("HyDict()") return '' + g("HyDict()")

10
tests/test_models.py
View File

@ -213,27 +213,27 @@ PRETTY_STRINGS.update({
'{{1j 2j} {1j 2j [][1j]} {[1j][] 1j 2j} {[1j][1j]}}': '{{1j 2j} {1j 2j [][1j]} {[1j][] 1j 2j} {[1j][1j]}}':
"""HyDict([ """HyDict([
HyDict([ HyDict([
HyComplex(1j), HyComplex(2j),]), HyComplex(1j), HyComplex(2j)]),
HyDict([ HyDict([
HyComplex(1j), HyComplex(2j), HyComplex(1j), HyComplex(2j),
HyList(), HyList(),
HyList([ HyList([
HyComplex(1j)]) HyComplex(1j)])
,]) ])
, ,
HyDict([ HyDict([
HyList([ HyList([
HyComplex(1j)]), HyComplex(1j)]),
HyList() HyList()
, ,
HyComplex(1j), HyComplex(2j),]), HyComplex(1j), HyComplex(2j)]),
HyDict([ HyDict([
HyList([ HyList([
HyComplex(1j)]), HyComplex(1j)]),
HyList([ HyList([
HyComplex(1j)]) HyComplex(1j)])
,]) ])
,])"""}) ])"""})
def test_compound_model_repr(): def test_compound_model_repr():