Merge pull request #130 from Capitains/tests_MC3

Tests mc3

CHANGES.mD

@@ -8,6 +8,12 @@ By @sonofmun
 - Minor changes to make Nemo compatible with MyCapytain 3.0.0
 - This version is no longer compatible with earlier versions of MyCapytain. Please upgrade to MyCapytain 3.0.0.
 
+## 1.0.4 - 22/10/2019
+
+By @ponteineptique
+
+- Ensure Nemo < 2.0.0 does not use MyCapytain 3.0.0
+
 ## 1.0.3 - 22/05/2018
 
 By @sonofmun

flask_nemo/chunker.py

@@ -14,7 +14,7 @@ def default_chunker(text, getreffs):
     :rtype: [(str, str)]
     """
     level = len(text.citation)
-    return [tuple([reff.split(":")[-1]]*2) for reff in getreffs(level=level)]
+    return [tuple([str(reff)]*2) for reff in getreffs(level=level)]
 
 
 def scheme_chunker(text, getreffs):
@@ -34,7 +34,7 @@ def scheme_chunker(text, getreffs):
         level = 2
     elif types == ["book", "line"]:
         return line_chunker(text, getreffs)
-    return [tuple([reff.split(":")[-1]]*2) for reff in getreffs(level=level)]
+    return [tuple([str(reff)]*2) for reff in getreffs(level=level)]
 
 
 def line_chunker(text, getreffs, lines=30):
@@ -50,7 +50,7 @@ def line_chunker(text, getreffs, lines=30):
     :rtype: [(str, str)]
     """
     level = len(text.citation)
-    source_reffs = [reff.split(":")[-1] for reff in getreffs(level=level)]
+    source_reffs = [str(reff) for reff in getreffs(level=level)]
     reffs = []
     i = 0
     while i + lines - 1 < len(source_reffs):
@@ -72,7 +72,7 @@ def level_chunker(text, getreffs, level=1):
     :rtype: [(str, str)]
     """
     references = getreffs(level=level)
-    return [(ref.split(":")[-1], ref.split(":")[-1]) for ref in references]
+    return [(str(ref), str(ref)) for ref in references]
 
 
 def level_grouper(text, getreffs, level=None, groupby=20):
@@ -87,7 +87,7 @@ def level_grouper(text, getreffs, level=None, groupby=20):
     if level is None or level > len(text.citation):
         level = len(text.citation)
 
-    references = [str(ref).split(":")[-1] for ref in getreffs(level=level)]
+    references = [str(ref) for ref in getreffs(level=level)]
     _refs = OrderedDict()
 
     for key in references:

flask_nemo/query/interface.py

@@ -129,7 +129,8 @@ def _getinnerreffs(self, objectId, subreference) -> BaseReference:
 
         while level > -1:
             try:
-                reffs: BaseReferenceSet = self._nemo.resolver.getReffs(
+                # type == BaseReferenceSet. I removed the explicit typing below since it broke the tests on Python 3.5.
+                reffs = self._nemo.resolver.getReffs(
                     objectId,
                     subreference=subreference,
                     level=level