fix __str__ bugs

python3/requirements.txt

@@ -1,2 +1,2 @@
-cbor>=0.1.4
-typing
+cbor>=1.0.0
+typing>=3.6.2

python3/setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name='trec-car-tools',
-    version='2.5',
+    version='2.5.2',
     packages=['trec_car'],
     url='https://github.com/TREMA-UNH/trec-car-tools/python3',
     # download_url='https://github.com/TREMA-UNH/trec-car-tools/archive/2.0.tar.gz',
@@ -12,7 +12,7 @@
     author='laura-dietz',
     author_email='Laura.Dietz@unh.edu',
     description='Support tools for TREC CAR participants. Also see trec-car.cs.unh.edu',
-    install_requires=['cbor>=0.1.4', 'typing'],
+    install_requires=['cbor>=1.0.0', 'typing>=3.6.2', 'numpy>=1.11.2],
     python_requires='>=3',
     classifiers=[
         'Programming Language :: Python :: 3',

python3/trec_car/read_data.py

@@ -385,11 +385,14 @@ def __init__(self, heading, headingId, children):
         self.children = list(children)
         self.child_sections =  [child for child in self.children if isinstance(child, Section)]
 
-    def __str__(self, level=1):
+    def str_(self, level):
         bar = "".join("="*level)
-        children = "".join(c.__str__(level=level+1) for c in self.children)
+        children = "".join(c.str_(level=level+1) for c in self.children)
         return "\n%s %s %s\n\n%s" % (bar, self.heading, bar, children)
 
+    def __str__(self):
+        return self.str_(level=1)
+
     def __getitem__(self, idx):
         return self.children[idx]
 
@@ -415,9 +418,12 @@ class Para(PageSkeleton):
     def __init__(self, paragraph):
         self.paragraph = paragraph
 
-    def __str__(self, level=None):
+    def str_(self, level=None):
         return str(self.paragraph)
 
+    def __str__(self):
+        return self.str_()
+
     def get_text(self):
         return self.paragraph.get_text()
 
@@ -442,9 +448,12 @@ def __init__(self, imageurl, caption):
         self.caption = caption
         self.imageurl = imageurl
 
-    def __str__(self, level=None):
+    def str_(self, level=None):
         return str("!["+self.imageurl+"]. Caption: "+(''.join([str(skel) for skel in self.caption])))
 
+    def __str__(self):
+        return self.str_()
+
     def get_text(self):
         return '\n'.join(skel.get_text() for skel in self.caption)
 
@@ -466,9 +475,13 @@ def __init__(self, level, body):
         self.level = level
         self.body = body
 
-    def __str__(self, level=None):
+    def str_(self, level=None):
         return str("*" * self.level + " " + str(self.body) + '\n')
 
+    def __str__(self):
+        return self.str_()
+
+
     def get_text(self):
         return self.body.get_text()
 
@@ -491,9 +504,14 @@ def __init__(self, infobox_type, entries):
         self.title = infobox_type
         self.entries = entries
 
-    def __str__(self):
+    def str_(self, level=None):
         return self.title+ "\n"+  ("\n".join([key+": "+str(values) for (key,values) in self.entries]))
 
+    def __str__(self):
+        return self.str_()
+
+
+
     def get_text(self):
         return ""
 
@@ -521,9 +539,13 @@ def get_text(self):
         """
         return ''.join([body.get_text() for body in self.bodies])
 
-    def __str__(self, level=None):
+    def str_(self, level=None):
         return ' '.join(str(body) for body in self.bodies)
 
+    def __str__(self):
+        return self.str_()
+
+
 class ParaBody(object):
     """
     An abstract superclass representing a bit of :class:`Paragraph` content.
@@ -568,9 +590,13 @@ def __init__(self, text):
     def get_text(self):
         return self.text
 
-    def __str__(self, level=None):
+    def str_(self, level=None):
         return self.text
 
+    def __str__(self):
+        return self.str_()
+
+
 class ParaLink(ParaBody):
     """
     A link within a paragraph.
@@ -609,9 +635,13 @@ def __init__(self, page, link_section, pageid, anchor_text):
     def get_text(self):
         return self.anchor_text
 
-    def __str__(self, level=None):
+    def str_(self, level=None):
         return "[%s](%s)" % (self.anchor_text, self.page)
 
+    def __str__(self):
+        return self.str_()
+
+
 def _iter_with_header(file, parse, expected_file_types):
     maybe_hdr = cbor.load(file)
     if isinstance(maybe_hdr, list) and maybe_hdr[0] == 'CAR':