From d5ce48535d722135f7cd76330a7462de57725e46 Mon Sep 17 00:00:00 2001
From: Daniel Watkins <daniel.watkins@canonical.com>
Date: Sun, 5 Aug 2018 16:47:44 -0400
Subject: [PATCH] Format single-element tuple string representations correctly

(i.e. with a trailing comma within the parentheses)
---
 vm/src/pyobject.rs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/vm/src/pyobject.rs b/vm/src/pyobject.rs
index cfcd8d20d..4134d4ae4 100644
--- a/vm/src/pyobject.rs
+++ b/vm/src/pyobject.rs
@@ -365,14 +365,18 @@ impl PyObject {
                     .collect::<Vec<_>>()
                     .join(", ")
             ),
-            PyObjectKind::Tuple { ref elements } => format!(
-                "({})",
-                elements
-                    .iter()
-                    .map(|elem| elem.borrow().str())
-                    .collect::<Vec<_>>()
-                    .join(", ")
-            ),
+            PyObjectKind::Tuple { ref elements } => if elements.len() == 1 {
+                format!("({},)", elements[0].borrow().str())
+            } else {
+                format!(
+                    "({})",
+                    elements
+                        .iter()
+                        .map(|elem| elem.borrow().str())
+                        .collect::<Vec<_>>()
+                        .join(", ")
+                )
+            },
             PyObjectKind::Dict { ref elements } => format!(
                 "{{ {} }}",
                 elements