Fixed python3 tests

Author: STITCHplus

.gitignore

@@ -1,3 +1,4 @@
 *.pyc
+kb.egg-info
 __pycache__
 build

example.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 import os
@@ -23,12 +23,7 @@
     print("RecordIdentifier: %s" % record.identifiers)
     print("Abstract: %s" % record.abstracts)
     print("Title: %s" % record.titles)
-
-
     oai_handler.DEBUG = True
     r = oai_handler.get(record.identifiers[0])
     for alto in r.alto:
         print("Fulltext: %s" % alto_to_text(alto))
-        #print(alto)
-
-    print("*************************************\n\n")

kb/nl/api/oai.py

@@ -95,6 +95,8 @@ def get(self, identifier):
 
             :param identifier: Identifier to get from OAI server
         """
+        identifier = identifier.replace('http://resolver.kb.nl/resolve?urn=', '')
+
         if self.current_set == "ANP":
             identifier = identifier.replace(':mpeg21', '')
             identifier = identifier.split(':')[0] + ':' + identifier

test/alto_to_text_test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 import os
@@ -19,7 +19,7 @@ def alto_to_text_test():
     >>> data = fh.read()
     >>> fh.close()
     >>> alto_to_text(data).split('\\n')[2][:45]
-    u' De Rijksradiocontroledienst heeft te UTRECHT'
+    ' De Rijksradiocontroledienst heeft te UTRECHT'
     """
 
 if __name__ == "__main__":

test/oai_test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import sys
@@ -26,7 +26,7 @@ def oai_anp():
     >>> len(alto_records[0])
     90124
     >>> alto_to_text(alto_records[0]).split("\\n")[1][:27]
-    u' RADIO 1 van 1 Ootober 1937'
+    ' RADIO 1 van 1 Ootober 1937'
     >>> image_record = record.image
     http://resolver.kb.nl/resolve?urn=anp:1937:10:01:1:mpeg21:image
     >>> len(image_record)
@@ -70,15 +70,15 @@ def oai_dpo():
     >>> records = oai.list_records("DPO") # doctest: +ELLIPSIS
     http://services.kb.nl/mdo/oai?verb=ListRecords&metadataPrefix=didl&set=DPO&resumptionToken...
     >>> records.identifiers[:3]
-    ['dpo:10007:mpeg21', 'dpo:10008:mpeg21', 'dpo:10009:mpeg21']
+    ['dpo:10012:mpeg21', 'dpo:10014:mpeg21', 'dpo:10015:mpeg21']
     >>> record = oai.get(records.identifiers[0])
-    http://services.kb.nl/mdo/oai?verb=GetRecord&identifier=DPO:dpo:10007:mpeg21&metadataPrefix=didl
+    http://services.kb.nl/mdo/oai?verb=GetRecord&identifier=DPO:dpo:10012:mpeg21&metadataPrefix=didl
     >>> alto_records = record.alto # doctest: +ELLIPSIS
-    http://resolver.kb.nl/resolve?urn=dpo:10007:mpeg21:0001:alto http://...
+    http://resolver.kb.nl/resolve?urn=dpo:10012:mpeg21:0001:alto http://...
     >>> len(alto_records[0])
-    21634
+    1739
     >>> record.title[:20]
-    'Aanmerkingen, wegens'
+    'De minagting der her'
     >>> record.contributor
     False
     >>> record.publisher
@@ -103,7 +103,7 @@ def oai_byvanck():
     >>> image = record.image
     http://imageviewer.kb.nl/ImagingService/imagingService?id=BYVANCKB:mimi_78d38:dl1_183r_min
     >>> len(image)
-    109258
+    109800
     """
 
 if __name__ == "__main__":

test/sru_test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 import os
@@ -11,15 +11,15 @@ def oai_anp():
     """
     >>> from kb.nl.api import sru
     >>> from kb.nl.helpers import alto_to_text
-    >>> sru.DEBUG=True
+    >>> sru.DEBUG = True
     >>> response = sru.search("beatrix AND juliana AND Bernhard AND gelukwensen", "ANP")
     run_query: https://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=1&recordSchema=dcx&x-collection=ANP&query=beatrix%20AND%20juliana%20AND%20Bernhard%20AND%20gelukwensen
     >>> for record in response.records:
     ...     print(record.dates)
     run_query: https://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=1&recordSchema=dcx&x-collection=ANP&query=beatrix%20AND%20juliana%20AND%20Bernhard%20AND%20gelukwensen
-    ['1967/04/28 00:00:00']
-    run_query: https://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=2&recordSchema=dcx&x-collection=ANP&query=beatrix%20AND%20juliana%20AND%20Bernhard%20AND%20gelukwensen
     ['1968/09/25 00:00:00']
+    run_query: https://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=2&recordSchema=dcx&x-collection=ANP&query=beatrix%20AND%20juliana%20AND%20Bernhard%20AND%20gelukwensen
+    ['1967/04/28 00:00:00']
     run_query: https://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=3&recordSchema=dcx&x-collection=ANP&query=beatrix%20AND%20juliana%20AND%20Bernhard%20AND%20gelukwensen
     ['1966/02/21 00:00:00']
     run_query: https://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=4&recordSchema=dcx&x-collection=ANP&query=beatrix%20AND%20juliana%20AND%20Bernhard%20AND%20gelukwensen
@@ -35,7 +35,7 @@ def oai_anp():
     >>> for i, record in enumerate(sorted(response.records)):
     ...     print(record.titles, record.dates)
     ...     break
-    (['Zij die vielen zijn gevallen / J.A. Deelder ; [foto: Pieter van Oudheusden]'], ['[ca. 1990]'])
+    ['Zij die vielen zijn gevallen'] ['[ca. 1990]']
     """