Merge branch 'release/0.4.3'

Author: bluec0re

.travis.yml

@@ -0,0 +1,8 @@
+language: python
+#python:
+#    - "2.7"
+#    - "3.4"
+install:
+    - pip install tox
+script:
+    - tox

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name = "wcf-binary parser",
-    version = "0.4.2",
+    version = "0.4.3",
     author = "Timo Schmid",
     author_email = "[email protected]",
     description = ("A library for transforming wcf-binary data from and to xml"),

tests/__init__.py

@@ -1,2 +1,5 @@
+from __future__ import absolute_import
+
+from . import alltests
+
 __all__ = ['alltests']
-import alltests

tests/alltests.py

@@ -6,12 +6,13 @@
 import doctest
 import unittest
 import sys
+from codecs import decode
 
 sys.path.append('..')
 
 from wcf.records import *
 
-test_bin = (
+test_bin = decode(
 "56020b0173040b0161065608440a1e0082993a687474703a2f2f646f6373"
 "2e6f617369732d6f70656e2e6f72672f77732d73782f77732d7472757374"
 "2f3230303531322f5253542f4973737565441aad5db293d4bc0ba547b9dc"
@@ -30,7 +31,7 @@
 "757374074b657953697a658b0001410574727573740e42696e6172794578"
 "6368616e67650674aaa60306d402aad8029e364e544c4d53535000010000"
 "00b7b218e20a000a002d00000005000500280000000601b11d0000000f43"
-"4c5753315745425345525649439f0145010101").decode('hex')
+"4c5753315745425345525649439f0145010101", "hex")
 
 class TransformTest(unittest.TestCase):
 

tox.ini

@@ -0,0 +1,6 @@
+[tox]
+#envlist = py27,py34
+envlist = py27
+[testenv]
+deps=pytest
+commands=py.test --doctest-modules tests wcf

wcf/MyHTMLParser.py

@@ -10,8 +10,11 @@
 # data -- only char and entity references and end tags are special)
 # and CDATA (character data -- only end tags are special).
 
+try:
+    import markupbase
+except ImportError:
+    import _markupbase as markupbase
 
-import markupbase
 import re
 
 # Regular expressions used for parsing

wcf/datatypes.py

@@ -29,6 +29,7 @@
 
 import struct
 import logging
+import sys
 
 log = logging.getLogger(__name__)
 
@@ -105,6 +106,12 @@ class Utf8String(object):
 
     def __init__(self, *args):
         self.value = args[0] if len(args) else None
+        if sys.version_info >= (3,0,0):
+            if not isinstance(self.value, str):
+                self.value = self.value.decode('utf-8')
+        else:
+            if not isinstance(self.value, unicode):
+                self.value = self.value.decode('utf-8')
 
     def to_bytes(self):
         """
@@ -115,28 +122,28 @@ def to_bytes(self):
         >>> Utf8String("\\xc3\\xbcber".decode('utf-8')).to_bytes()
         '\\x05\\xc3\\xbcber'
         """
-	data   = self.value.encode('utf-8')
+        data   = self.value.encode('utf-8')
         strlen = len(data)
 
         return MultiByteInt31(strlen).to_bytes() + data
 
     def __str__(self):
-        return self.value.decode('latin1')
+        return self.value.encode('utf-8')
 
     def __unicode__(self):
-	return self.value
+        return self.value
 
     @classmethod
     def parse(cls, fp):
-	"""
-	>>> from StringIO import StringIO as io
-	>>> fp = io("\\x05\\xc3\\xbcber")
-	>>> s = Utf8String.parse(fp)
-	>>> s.to_bytes()
+        """
+        >>> from StringIO import StringIO as io
+        >>> fp = io("\\x05\\xc3\\xbcber")
+        >>> s = Utf8String.parse(fp)
+        >>> s.to_bytes()
         '\\x05\\xc3\\xbcber'
-	>>> print str(s)
-	'über'
-	"""
+        >>> print str(s)
+        über
+        """
         lngth = struct.unpack('<B', fp.read(1))[0]
 
         return cls(fp.read(lngth).decode('utf-8'))
@@ -187,6 +194,12 @@ def __str__(self):
 
     @classmethod
     def parse(cls, fp):
+        """
+        >>> from StringIO import StringIO as io
+        >>> buf = io('\\x00\\x00\\x06\\x00\\x00\\x00\\x00\\x00\\x80-N\\x00\\x00\\x00\\x00\\x00')
+        >>> str(Decimal.parse(buf))
+        '5.123456'
+        """
         log.warn('Possible false interpretation')
         fp.read(2)
         scale = struct.unpack('<B', fp.read(1))[0]

wcf/dictionary.py

@@ -516,4 +516,4 @@
 0x3CC : 'detail',
 }
 
-inverted_dict = dict([(v, k) for (k, v) in dictionary.iteritems()])
+inverted_dict = dict([(v, k) for (k, v) in dictionary.items()])

wcf/records/__init__.py

@@ -26,7 +26,7 @@
 #  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 #  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-from __future__ import absolute_import
+from __future__ import absolute_import, print_function
 import sys
 import logging
 
@@ -81,7 +81,7 @@ def repr_records(records, skip=0):
         return
 
     for r in records:
-        print ' '*skip + str(r)
+        print(' '*skip + str(r))
         if hasattr(r, 'childs'):
             repr_records(r.childs, skip+1)
 
@@ -92,9 +92,9 @@ def dump_records(records):
     :param records: the record tree
     :type records: wcf.records.Record
     :returns: a bytestring
-    :rtype: str
+    :rtype: str|bytes
     """
-    out = ''
+    out = b''
 
     for r in records:
         msg = 'Write %s' % type(r).__name__

wcf/records/text.py

@@ -33,7 +33,12 @@
 import datetime
 import logging
 import uuid
-from htmlentitydefs import codepoint2name
+import sys
+
+try:
+    from htmlentitydefs import codepoint2name
+except ImportError:
+    from html.entities import codepoint2name
 
 
 def escapecp(cp):
@@ -188,10 +193,16 @@ class UnicodeChars8TextRecord(Text):
     type = 0xB6
 
     def __init__(self, string):
-        if isinstance(string, unicode):
-            self.value = string
+        if sys.version_info >= (3, 0, 0):
+            if isinstance(string, str):
+                self.value = string
+            else:
+                self.value = str(string)
         else:
-            self.value = unicode(string)
+            if isinstance(string, unicode):
+                self.value = string
+            else:
+                self.value = unicode(string)
 
     def to_bytes(self):
         """
@@ -423,10 +434,16 @@ class Chars8TextRecord(Text):
     type = 0x98
 
     def __init__(self, value):
-        if isinstance(value, unicode):
-            self.value = value
+        if sys.version_info >= (3, 0, 0):
+            if isinstance(value, str):
+                self.value = value
+            else:
+                self.value = str(value)
         else:
-            self.value = unicode(value)
+            if isinstance(value, unicode):
+                self.value = value
+            else:
+                self.value = unicode(value)
 
     def __str__(self):
         return escape(self.value)

wcf/xml2records.py

@@ -4,7 +4,11 @@
 from __future__ import absolute_import
 
 from wcf.MyHTMLParser import HTMLParser
-from htmlentitydefs import name2codepoint
+try:
+    from htmlentitydefs import name2codepoint
+except ImportError:
+    from html.entities import name2codepoint
+
 import re
 import base64
 import logging
@@ -262,7 +266,11 @@ def handle_comment(self, comment):
         self.last_record.childs.append(CommentRecord(comment))
 
     def parse_marked_section(self, i, report=1):
-        from markupbase import _markedsectionclose, _msmarkedsectionclose
+        try:
+            from markupbase import _markedsectionclose, _msmarkedsectionclose
+        except ImportError:
+            from _markupbase import _markedsectionclose, _msmarkedsectionclose
+
         rawdata= self.rawdata
         assert rawdata[i:i+3] == '<![', "unexpected call to parse_marked_section()"
         sectName, j = self._scan_name( i+3, i )

wcf2xml.py

@@ -29,8 +29,12 @@
 
 if __name__ == '__main__':
     import sys
-    from wcf.records import Record,print_records
-    fp = sys.stdin
+    from wcf.records import Record, print_records
+
+    if sys.version_info >= (3, 0, ):
+        fp = sys.stdin.buffer
+    else:
+        fp = sys.stdin
     if len(sys.argv) > 1:
         filename = sys.argv[1]
         fp = open(filename, 'rb')

xml2wcf.py

@@ -19,4 +19,9 @@
 
     with fp:
         r = XMLParser.parse(fp)
-        sys.stdout.write(dump_records(r))
+        data = dump_records(r)
+
+    if sys.version_info >= (3, 0, 0):
+        sys.stdout.buffer.write(data)
+    else:
+        sys.stdout.write(data)