Fix for 2.7 tests

Author: STITCHplus

Diff for: Makefile

@@ -9,10 +9,10 @@ testENV:
 	python setup.py install
 
 testOAI:
-	python ./test/oai_test.py
+	python2.7 ./test/oai_test.py
 
 testSRU:
-	python ./test/sru_test.py
+	python2.7 ./test/sru_test.py
 
 testALTOtoTXT:
 	python ./test/alto_to_text_test.py

Diff for: test/sru_test.py

@@ -13,29 +13,29 @@ def oai_anp():
     >>> from kb.nl.helpers import alto_to_text
     >>> sru.DEBUG=True
     >>> response = sru.search("beatrix AND juliana AND Bernhard AND gelukwensen", "ANP")
-    http://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=1&recordSchema=dcx&x-collection=ANP&query=beatrix+AND+juliana+AND+Bernhard+AND+gelukwensen
+    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)
-    http://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=1&recordSchema=dcx&x-collection=ANP&query=beatrix+AND+juliana+AND+Bernhard+AND+gelukwensen['1967/04/28 00:00:00']
-    http://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=2&recordSchema=dcx&x-collection=ANP&query=beatrix+AND+juliana+AND+Bernhard+AND+gelukwensen['1968/09/25 00:00:00']
-    http://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=3&recordSchema=dcx&x-collection=ANP&query=beatrix+AND+juliana+AND+Bernhard+AND+gelukwensen['1966/02/21 00:00:00']
-    http://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=4&recordSchema=dcx&x-collection=ANP&query=beatrix+AND+juliana+AND+Bernhard+AND+gelukwensen['1966/03/10 00:00:00']
-    http://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=5&recordSchema=dcx&x-collection=ANP&query=beatrix+AND+juliana+AND+Bernhard+AND+gelukwensen['1966/03/09 00:00:00']
-    http://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=6&recordSchema=dcx&x-collection=ANP&query=beatrix+AND+juliana+AND+Bernhard+AND+gelukwensen['1969/10/11 00:00:00']
-    http://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=7&recordSchema=dcx&x-collection=ANP&query=beatrix+AND+juliana+AND+Bernhard+AND+gelukwensen['1965/06/29 00:00:00']
+    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=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
+    ['1966/03/10 00:00:00']
+    run_query: https://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=5&recordSchema=dcx&x-collection=ANP&query=beatrix%20AND%20juliana%20AND%20Bernhard%20AND%20gelukwensen
+    ['1966/03/09 00:00:00']
+    run_query: https://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=6&recordSchema=dcx&x-collection=ANP&query=beatrix%20AND%20juliana%20AND%20Bernhard%20AND%20gelukwensen
+    ['1969/10/11 00:00:00']
+    run_query: https://jsru.kb.nl/sru/sru?version=1.2&maximumRecords=1&operation=searchRetrieve&startRecord=7&recordSchema=dcx&x-collection=ANP&query=beatrix%20AND%20juliana%20AND%20Bernhard%20AND%20gelukwensen
+    ['1965/06/29 00:00:00']
     >>> sru.DEBUG = False
-    >>> response = sru.search('"J.A. Deelder"', "GGC")
-    >>> for i, record in enumerate(response.records):
+    >>> response = sru.search('"J.A. Deelder" AND "gevallen"', "GGC")
+    >>> for i, record in enumerate(sorted(response.records)):
     ...     print(record.titles, record.dates)
-    ...     if i > 5:
-    ...         break
-    (['Ogenschijnlijk / [J.A. Deelder ; foto: Pieter van Oudheusden]'], ['[ca. 1990]'])
-    (['Honderdjarige / [J.A. Deelder ; foto: Pieter van Oudheusden]'], ['[ca. 1990]'])
-    (['Rotown magic / [J.A. Deelder ; foto: Hansje de Reuver]'], ['[ca. 1990]'])
-    (['Het gedicht is een zucht van verlichting / [J.A. Deelder ; foto: Hansje de Reuver]'], ['[ca. 1990]'])
-    (['Fabeldier / [J.A. Deelder ; foto: Hansje de Reuver]'], ['[ca. 1990]'])
-    (['Het duistert, rook slaat neer ... / [J.A. Deelder ; foto: Pieter van Oudheusden]'], ['[ca. 1990]'])
-    (['Je lacht je ziek / [J.A. Deelder ; foto: Pieter van Oudheusden]'], ['[ca. 1990]'])
+    ...     break
+    (['Zij die vielen zijn gevallen / J.A. Deelder ; [foto: Pieter van Oudheusden]'], ['[ca. 1990]'])
     """