Python 3 preparation: unichr.

Author: jsm28

roundup/anypy/strings.py

@@ -73,3 +73,10 @@ def is_us(s):
         return isinstance(s, str)
     else:
         return isinstance(s, str) or isinstance(s, unicode)
+
+def uchr(c):
+    """Return the Unicode string containing the given character."""
+    if _py3:
+        return chr(c)
+    else:
+        return unichr(c)

roundup/cgi/client.py

@@ -49,6 +49,8 @@
 from email.MIMEMultipart import MIMEMultipart
 import roundup.anypy.email_
 
+from roundup.anypy.strings import uchr
+
 def initialiseSecurity(security):
     '''Create some Permissions and Roles on the security object
 
@@ -778,7 +780,7 @@ def _decode_charref(matchobj):
                     uc = int(num[1:], 16)
                 else:
                     uc = int(num)
-                return unichr(uc)
+                return uchr(uc)
 
             for field_name in self.form:
                 field = self.form[field_name]

roundup/dehtml.py

@@ -1,6 +1,6 @@
 
 from __future__ import print_function
-from roundup.anypy.strings import u2s
+from roundup.anypy.strings import u2s, uchr
 class dehtml:
     def __init__(self, converter):
         if converter == "none":
@@ -70,7 +70,7 @@ def handle_endtag(self, tag):
                 def handle_entityref(self, name):
                     if self._skip_data:
                         return
-                    c = unichr(name2codepoint[name])
+                    c = uchr(name2codepoint[name])
                     try:
                         self.text= self.text + c
                     except UnicodeEncodeError: