py27 compat

ferenda/sources/legal/se/myndfskr.py

@@ -11,7 +11,10 @@
 import re
 import json
 from collections import OrderedDict
-from functools import lru_cache
+try:
+    from functools import lru_cache
+except ImportError:
+    from backports.functools_lru_cache import lru_cache
 
 from rdflib import URIRef, Literal, Namespace
 from bs4 import BeautifulSoup

requirements.py2.txt

@@ -32,3 +32,4 @@ responses<0.6.0 # newer versions don't support 2.6
 importlib
 langdetect
 bz2file   # backport
+backports.functools_lru_cache # another backport

test/testTOC.py

@@ -174,8 +174,8 @@ def test_generate_page(self):
 
         # 2.2 JS links, relativized correctly?
         js = t.findall("body/script")
-        self.assertEqual(len(js), 5) # jquery, bootstrap, hammer, typeahead, ferenda
-        self.assertRegex(js[4].get('src'), '^../../../rsrc/js')
+        self.assertEqual(len(js), 4) # jquery, bootstrap, typeahead, ferenda
+        self.assertRegex(js[3].get('src'), '^../../../rsrc/js')
         # 2.3 <nav id="toc"> correct (c.f 1.2)
         navlinks = t.findall(".//nav[@id='toc']//li/a")
         self.assertEqual(len(navlinks),9)

test/testWSGI.py

@@ -799,8 +799,7 @@ def test_search_multiple(self):
         self.assertEqual('https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css',
                          css[0].get('href'))
         js = t.findall("body/script")
-        self.assertEqual(len(js), 5) # jquery, bootstrap, hammer, ferenda, typeahead
-
+        self.assertEqual(len(js), 4) # jquery, bootstrap, ferenda, typeahead
         resulthead = t.find(".//article/h1").text
         self.assertEqual(resulthead, "3 matches for 'part'")
         docs = t.findall(".//section[@class='hit']")