Remaining Django 1.9 fixes.

diff --git a/src/funding/templates/funding/offer_detail.html b/src/funding/templates/funding/offer_detail.html
index 556ec13..96a65d6 100644 (file)
--- a/src/funding/templates/funding/offer_detail.html
+++ b/src/funding/templates/funding/offer_detail.html
@@ -1,5 +1,4 @@
 {% extends "base/base.html" %}
 {% extends "base/base.html" %}

-{% load url from future %}

 {% load i18n static %}
 {% load pagination_tags %}
 {% load fnp_share %}
 {% load i18n static %}
 {% load pagination_tags %}
 {% load fnp_share %}

diff --git a/src/funding/templates/funding/offer_list.html b/src/funding/templates/funding/offer_list.html
index 85c7b90..055e1ce 100644 (file)
--- a/src/funding/templates/funding/offer_list.html
+++ b/src/funding/templates/funding/offer_list.html
@@ -1,5 +1,4 @@
 {% extends "base/base.html" %}
 {% extends "base/base.html" %}

-{% load url from future %}

 {% load i18n %}
 {% load ssi_include from ssify %}
 {% load pagination_tags %}
 {% load i18n %}
 {% load ssi_include from ssify %}
 {% load pagination_tags %}

diff --git a/src/opds/views.py b/src/opds/views.py
index 0c31cd2..adfd073 100644 (file)
--- a/src/opds/views.py
+++ b/src/opds/views.py
@@ -104,7 +104,7 @@ class OPDSFeed(Atom1Feed):
         handler.addQuickElement(u"title", item['title'])
 
         # add a OPDS Navigation link if there's no enclosure
         handler.addQuickElement(u"title", item['title'])
 
         # add a OPDS Navigation link if there's no enclosure

-        if item['enclosure'] is None:
+        if not item.get('enclosures') is None:

             handler.addQuickElement(
                 u"link", u"", {u"href": item['link'], u"rel": u"subsection", u"type": u"application/atom+xml"})
             # add a "green book" icon
             handler.addQuickElement(
                 u"link", u"", {u"href": item['link'], u"rel": u"subsection", u"type": u"application/atom+xml"})
             # add a "green book" icon


@@ -144,14 +144,14 @@ class OPDSFeed(Atom1Feed):
             handler.addQuickElement(u"summary", item['description'], {u"type": u"text"})
 
         # Enclosure as OPDS Acquisition Link
             handler.addQuickElement(u"summary", item['description'], {u"type": u"text"})
 
         # Enclosure as OPDS Acquisition Link

-        if item['enclosure'] is not None:
+        for enc in item.get('enclosures', []):

             handler.addQuickElement(
                 u"link", '',
                 {
                     u"rel": u"http://opds-spec.org/acquisition",
             handler.addQuickElement(
                 u"link", '',
                 {
                     u"rel": u"http://opds-spec.org/acquisition",

-                    u"href": item['enclosure'].url,
-                    u"length": item['enclosure'].length,
-                    u"type": item['enclosure'].mime_type,
+                    u"href": enc.url,
+                    u"length": enc.length,
+                    u"type": enc.mime_type,

                 })
             # add a "red book" icon
             handler.addQuickElement(
                 })
             # add a "red book" icon
             handler.addQuickElement(