Quick fix to make Python Koans compatible with Python 2.7

gregmalcolm · gregmalcolm · commit dba661c91477 · 2010-07-30T23:51:15.000-04:00
diff --git a/python 2_6/runner/mountain.py b/python 2_6/runner/mountain.py
@@ -6,10 +6,11 @@
 
 import path_to_enlightenment
 from sensei import Sensei
+from writeln_decorator import WritelnDecorator
 
 class Mountain:
     def __init__(self):
-        self.stream = unittest._WritelnDecorator(sys.stdout)
+        self.stream = WritelnDecorator(sys.stdout)
         self.tests = path_to_enlightenment.koans()
         self.lesson = Sensei(self.stream)
     
diff --git a/python 2_6/runner/runner_tests/test_sensei.py b/python 2_6/runner/runner_tests/test_sensei.py
@@ -8,6 +8,7 @@
 from libs.mock import *
 
 from runner.sensei import Sensei
+from runner.writeln_decorator import WritelnDecorator
 from runner.mockable_test_result import MockableTestResult
 
 class AboutParrots:
@@ -82,7 +83,7 @@ class AboutFreemasons:
 class TestSensei(unittest.TestCase):
 
     def setUp(self):
-        self.sensei = Sensei(unittest._WritelnDecorator(sys.stdout))
+        self.sensei = Sensei(WritelnDecorator(sys.stdout))
         self.sensei.stream.writeln = Mock()
         
     def test_that_it_delegates_testing_to_test_cases(self):
diff --git a/python 2_6/runner/writeln_decorator.py b/python 2_6/runner/writeln_decorator.py
@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+import sys
+import os
+
+# Taken from legacy python unittest
+class WritelnDecorator:
+    """Used to decorate file-like objects with a handy 'writeln' method"""
+    def __init__(self,stream):
+        self.stream = stream
+
+    def __getattr__(self, attr):
+        return getattr(self.stream,attr)
+
+    def writeln(self, arg=None):
+        if arg: self.write(arg)
+        self.write('\n') # text-mode streams translate to \r\n if needed
+
