Merge branch 'hotfix/0.5.4'

bluec0re · bluec0re · commit 5c153b746e97 · 2015-12-21T10:28:52.000+01:00
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34
+envlist = py27,py35
 #envlist = py27
 [testenv]
 deps=pytest
diff --git a/wcf/records/text.py b/wcf/records/text.py
@@ -120,6 +120,10 @@ def to_bytes(self):
                      struct.pack(b'<b', self.value))
 
     def __str__(self):
+        r"""
+        >>> str(Int8TextRecord(42))
+        '42'
+        """
         return str(self.value)
 
     @classmethod
@@ -238,6 +242,10 @@ def to_bytes(self):
                      struct.pack(b'<B', 1 if self.value else 0))
 
     def __str__(self):
+        r"""
+        >>> str(BoolTextRecord(True))
+        'True'
+        """
         return str(self.value)
 
     @classmethod
@@ -275,6 +283,10 @@ def to_bytes(self):
         return bytes(bt)
 
     def __str__(self):
+        r"""
+        >>> str(UnicodeChars8TextRecord('abc'))
+        'abc'
+        """
         return self.value
 
     @classmethod
@@ -306,9 +318,6 @@ def to_bytes(self):
         bt += data
         return bytes(bt)
 
-    def __str__(self):
-        return self.value
-
     @classmethod
     def parse(cls, fp):
         """
@@ -338,9 +347,6 @@ def to_bytes(self):
         bt += data
         return bytes(bt)
 
-    def __str__(self):
-        return self.value
-
     @classmethod
     def parse(cls, fp):
         """
@@ -490,6 +496,10 @@ def __init__(self, value):
         self.value = value
 
     def __str__(self):
+        r"""
+        >>> str(DecimalTextRecord(Decimal(False, 0, 1337, 3)))
+        '1.337'
+        """
         return str(self.value)
 
     def to_bytes(self):
@@ -573,6 +583,12 @@ def __init__(self, value):
             self.value = str(value)
 
     def __str__(self):
+        r"""
+        >>> str(Chars8TextRecord("abc"))
+        'abc'
+        >>> str(Chars8TextRecord("a<b>c>>&'\""))
+        "a&lt;b&gt;c&gt;&gt;&amp;'&quot;"
+        """
         return escape(self.value)
 
     def to_bytes(self):
@@ -673,6 +689,10 @@ def to_bytes(self):
         return bytes(bt)
 
     def __str__(self):
+        r"""
+        >>> str(UniqueIdTextRecord('urn:uuid:33221100-5544-7766-8899-aabbccddeeff'))
+        'urn:uuid:33221100-5544-7766-8899-aabbccddeeff'
+        """
         return self.uuid.urn
 
     @classmethod
@@ -717,7 +737,11 @@ def to_bytes(self):
         return bytes(bt)
 
     def __str__(self):
-        return base64.b64encode(self.value)
+        r"""
+        >>> str(Bytes8TextRecord(b'abc'))
+        'YWJj'
+        """
+        return base64.b64encode(self.value).decode()
 
     @classmethod
     def parse(cls, fp):
@@ -736,10 +760,7 @@ class Bytes16TextRecord(Bytes8TextRecord):
     type = 0xA0
 
     def __init__(self, data):
-        self.value = data
-
-    def __str__(self):
-        return base64.b64encode(self.value)
+        super(Bytes16TextRecord, self).__init__(data)
 
     def to_bytes(self):
         r"""
@@ -769,10 +790,7 @@ class Bytes32TextRecord(Bytes8TextRecord):
     type = 0xA2
 
     def __init__(self, data):
-        self.value = data
-
-    def __str__(self):
-        return base64.b64encode(self.value)
+        super(Bytes32TextRecord, self).__init__(data)
 
     def to_bytes(self):
         r"""
@@ -854,6 +872,10 @@ def to_bytes(self):
                      MultiByteInt31(self.index).to_bytes())
 
     def __str__(self):
+        r"""
+        >>> str(DictionaryTextRecord(2))
+        'Envelope'
+        """
         return dictionary[self.index]
 
     @classmethod
