From d38956fb9e7ad9b75e0cfa1f2737f1dc94cf5ef3 Mon Sep 17 00:00:00 2001
From: gilch <gilch@users.noreply.github.com>
Date: Mon, 18 Sep 2017 00:58:14 -0600
Subject: [PATCH] remove trailing commas in HyDict reprs

---
 docs/language/core.rst |  2 +-
 hy/models.py           |  6 +++---
 tests/test_models.py   | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/language/core.rst b/docs/language/core.rst
index 7483a0b..3e9611b 100644
--- a/docs/language/core.rst
+++ b/docs/language/core.rst
@@ -633,7 +633,7 @@ arguments. If the argument list only has one element, return it.
     => (list* 1 10  2 20 '{})
     HyDict([
       HyInteger(1), HyInteger(10),
-      HyInteger(2), HyInteger(20),])
+      HyInteger(2), HyInteger(20)])
     => (list* 1 10  2 20 {})
     <HyCons (
       HyInteger(1)
diff --git a/hy/models.py b/hy/models.py
index a9fe201..44fdc8f 100644
--- a/hy/models.py
+++ b/hy/models.py
@@ -275,14 +275,14 @@ class HyDict(HyList):
                 for k, v in zip(self[::2],self[1::2]):
                     k, v = repr_indent(k), repr_indent(v)
                     pairs.append(
-                        ("{0}{c}\n  {1}\n  {c}"
+                        ("{0}{c}\n  {1}\n  "
                          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:
                     pairs.append("{}  {}\n".format(
                         repr_indent(self[-1]), g("# odd")))
                 return "{}\n  {}{}".format(
-                    g("HyDict(["), ("\n  ".join(pairs)), g("])"))
+                    g("HyDict(["), ("{c}\n  ".format(c=g(',')).join(pairs)), g("])"))
             else:
                 return '' + g("HyDict()")
 
diff --git a/tests/test_models.py b/tests/test_models.py
index 927b8f4..89c5e16 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -213,27 +213,27 @@ PRETTY_STRINGS.update({
     '{{1j 2j} {1j 2j [][1j]} {[1j][] 1j 2j} {[1j][1j]}}':
         """HyDict([
   HyDict([
-    HyComplex(1j), HyComplex(2j),]),
+    HyComplex(1j), HyComplex(2j)]),
   HyDict([
     HyComplex(1j), HyComplex(2j),
     HyList(),
     HyList([
       HyComplex(1j)])
-    ,])
+    ])
   ,
   HyDict([
     HyList([
       HyComplex(1j)]),
     HyList()
     ,
-    HyComplex(1j), HyComplex(2j),]),
+    HyComplex(1j), HyComplex(2j)]),
   HyDict([
     HyList([
       HyComplex(1j)]),
     HyList([
       HyComplex(1j)])
-    ,])
-  ,])"""})
+    ])
+  ])"""})
 
 
 def test_compound_model_repr():