Standardize Unicode outputs

tests.py

@@ -94,7 +94,7 @@ def test_unicode(self):
             self.assertEqual(str(vevent), str(vevent2))
             self.assertEqual(
                 vevent.summary.value,
-                'The title こんにちはキティ'
+                u'The title こんにちはキティ'
             )
 
     def test_wrapping(self):

vobject/base.py

@@ -23,7 +23,7 @@
 
     def str_(s):
         """
-        Return string with correct encoding
+        Return byte string with correct encoding
         """
         if type(s) == unicode:
             return s.encode('utf-8')
@@ -76,11 +76,11 @@ def to_basestring(s):
 DEBUG = False  # Don't waste time on debug calls
 
 # ----------------------------------- Constants --------------------------------
-CR     = '\r'
-LF     = '\n'
-CRLF   = CR + LF
-SPACE  = ' '
-TAB    = '\t'
+CR = '\r'
+LF = '\n'
+CRLF = CR + LF
+SPACE = ' '
+TAB = '\t'
 SPACEORTAB = SPACE + TAB
 
 # --------------------------------- Main classes -------------------------------
@@ -360,8 +360,7 @@ def copy(self, copyit):
 
     def __eq__(self, other):
         try:
-            return (self.name == other.name) and (self.params == other.params)\
-                   and (self.value == other.value)
+            return (self.name == other.name) and (self.params == other.params) and (self.value == other.value)
         except Exception:
             return False
 
@@ -428,11 +427,17 @@ def valueRepr(self):
         return v
 
     def __str__(self):
-        return "<{0}{1}{2}>".format(self.name, self.params, self.valueRepr())
+        try:
+            return "<{0}{1}{2}>".format(self.name, self.params, self.valueRepr())
+        except UnicodeEncodeError as e:
+            return "<{0}{1}{2}>".format(self.name, self.params, self.valueRepr().encode('utf-8'))
 
     def __repr__(self):
         return self.__str__()
 
+    def __unicode__(self):
+        return u"<{0}{1}{2}>".format(self.name, self.params, self.valueRepr())
+
     def prettyPrint(self, level=0, tabwidth=3):
         pre = ' ' * level * tabwidth
         print(pre, self.name + ":", self.valueRepr())
@@ -473,8 +478,8 @@ def __init__(self, name=None, *args, **kwds):
         self.autoBehavior()
 
     @classmethod
-    def duplicate(clz, copyit):
-        newcopy = clz()
+    def duplicate(cls, copyit):
+        newcopy = cls()
         newcopy.copy(copyit)
         return newcopy
 
@@ -946,7 +951,7 @@ def foldOneLine(outbuf, input, lineLength=75):
             outbuf.write(bytes(input, 'UTF-8'))
         except Exception:
             # fall back on py2 syntax
-            outbuf.write(str_(input))
+            outbuf.write(input)
 
     else:
         # Look for valid utf8 range and write that out
@@ -1013,12 +1018,15 @@ def defaultSerialize(obj, buf, lineLength):
 
         if obj.group is not None:
             s.write(obj.group + '.')
-        s.write(obj.name.upper())
+        s.write(str_(obj.name.upper()))
         keys = sorted(obj.params.keys())
         for key in keys:
             paramstr = ','.join(dquoteEscape(p) for p in obj.params[key])
             s.write(";{0}={1}".format(key, paramstr))
-        s.write(":{0}".format(str_(obj.value)))
+        try:
+            s.write(":{0}".format(obj.value))
+        except (UnicodeDecodeError, UnicodeEncodeError) as e:
+            s.write(":{0}".format(obj.value.encode('utf-8')))
         if obj.behavior and not startedEncoded:
             obj.behavior.decode(obj)
         foldOneLine(outbuf, s.getvalue(), lineLength)
@@ -1067,7 +1075,7 @@ def readComponents(streamOrString, validate=False, transform=True,
     Generate one Component at a time from a stream.
     """
     if isinstance(streamOrString, basestring):
-        stream = six.StringIO(str_(streamOrString))
+        stream = six.StringIO(streamOrString)
     else:
         stream = streamOrString
 

vobject/icalendar.py

@@ -443,7 +443,7 @@ def getrruleset(self, addRDate=False):
 
                     # a Ruby iCalendar library escapes semi-colons in rrules,
                     # so also remove any backslashes
-                    value = str_(line.value).replace('\\', '')
+                    value = line.value.replace('\\', '')
                     rule = rrule.rrulestr(
                         value, dtstart=dtstart,
                         # If dtstart has no time zone, `until`
@@ -657,7 +657,7 @@ def encode(cls, line):
             if encoding and encoding.upper() == cls.base64string:
                 line.value = base64.b64encode(line.value.encode('utf-8')).decode('utf-8').replace('\n', '')
             else:
-                line.value = backslashEscape(str_(line.value))
+                line.value = backslashEscape(line.value)
             line.encoded = True