codecamp
diff --git a/‎frameworks/python/cw-2.py‎
Lines changed: 6 additions & 5 deletions b/‎frameworks/python/cw-2.py‎
Lines changed: 6 additions & 5 deletions
diff --git a/‎test/runners/python_spec.js‎
Lines changed: 5 additions & 2 deletions b/‎test/runners/python_spec.js‎
Lines changed: 5 additions & 2 deletions
@@ -1,12 +1,12 @@
 from __future__ import print_function
-import six
+import re, six
 
 class AssertException(Exception):
     pass
 
 
 '''Fix the dreaded Unicode Error Trap'''
-def print(*args, **kwargs):
+def uni_print(*args, **kwargs):
     from sys import stdout
     sep = kwargs.get('sep', ' ')
     end = kwargs.get('end', '\n')
@@ -16,9 +16,10 @@ def _replace(c):
         if ord(c) >= 128: return u'&#{};'.format(ord(c))
         return c
     def _escape(s):
-        if isinstance(s, six.string_types):
-            return ''.join(_replace(c) for c in s)
-        return s
+        escaped = ''.join(_replace(c) for c in six.text_type(s))
+        escaped = re.sub(r'\\u([\da-f]{4})', lambda m: '&#{};'.format(int(m.group(1), 16)), escaped)
+        escaped = re.sub(r'\\U([\da-f]{8})', lambda m: '&#{};'.format(int(m.group(1), 16)), escaped)
+        return escaped
 
     six.print_(*map(_escape, args), sep=_escape(sep), end=_escape(end), file=file)
 
 
@@ -329,9 +329,12 @@ describe('Fixed and new features', function() {
         languageVersion: v,
         testFramework: 'cw-2',
         code: 'a = 1',
-        fixture: 'print(1, "2", u"\\uac00")',
+        fixture: 'test.uni_print(1, "a", u"\\uac00", [314159, "b", u"\\uac01"])',
       }, function(buffer) {
-        expect(buffer.stdout).to.include('1 2 &#44032;');
+        expect(buffer.stdout).to.include('1 a &#44032;');
+        expect(buffer.stdout).to.include('314159');
+        expect(buffer.stdout).to.include('b');
+        expect(buffer.stdout).to.include('&#44033;');
         done();
       });
     });