Merge pull request #392 from toshok/set-softspace

split the getattr/setattr of softspace into two try blocks

src/runtime/objmodel.cpp

@@ -180,6 +180,7 @@ extern "C" bool softspace(Box* b, bool newval) {
     }
 
     bool r;
+    Box* gotten = NULL;
     try {
         Box* gotten = getattrInternal(b, "softspace", NULL);
         if (!gotten) {
@@ -187,6 +188,11 @@ extern "C" bool softspace(Box* b, bool newval) {
         } else {
             r = nonzero(gotten);
         }
+    } catch (ExcInfo e) {
+        r = 0;
+    }
+
+    try {
         setattr(b, "softspace", boxInt(newval));
     } catch (ExcInfo e) {
         r = 0;

test/tests/softspace.py

+# expected: fail
+
+import sys
+
+old_stdout = sys.stdout
+
+class SoftspaceTest(object):
+    def write(self, str):
+        print >>old_stdout, self.softspace
+        old_stdout.write(str)
+
+sys.stdout = SoftspaceTest()
+
+print "hello"
+print "world"
+
+print "hello", "world"
+
+print "hello",
+print "world",