cwvreg.py
changeset 10689 49a62b8f6d43
parent 10666 7f6b5f023884
child 10907 9ae707db5265
--- a/cwvreg.py	Wed Sep 16 13:57:21 2015 +0200
+++ b/cwvreg.py	Wed Sep 16 15:17:42 2015 +0200
@@ -28,6 +28,8 @@
 from datetime import datetime, date, time, timedelta
 from functools import reduce
 
+from six import text_type, binary_type
+
 from logilab.common.decorators import cached, clear_cache
 from logilab.common.deprecation import deprecated, class_deprecated
 from logilab.common.modutils import cleanup_sys_modules
@@ -221,9 +223,9 @@
         """
         obj = self.select(oid, req, rset=rset, **kwargs)
         res = obj.render(**kwargs)
-        if isinstance(res, unicode):
+        if isinstance(res, text_type):
             return res.encode(req.encoding)
-        assert isinstance(res, str)
+        assert isinstance(res, binary_type)
         return res
 
     def possible_views(self, req, rset=None, **kwargs):