[allura] 05/14: [#8354] webhelpers.feedgenerator -> standalone feedgenerator package

[br...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch db/8354
in repository https://gitbox.apache.org/repos/asf/allura.git

commit 9c46fb0fba9b9d7b9f6dba9c72e9838a2041f206
Author: Dave Brondsema <da...@brondsema.net>
AuthorDate: Fri Mar 6 16:22:51 2020 -0500

    [#8354] webhelpers.feedgenerator -> standalone feedgenerator package
---
 Allura/allura/lib/helpers.py                       | 3 +--
 Allura/allura/model/artifact.py                    | 4 ++--
 ForgeActivity/forgeactivity/main.py                | 2 +-
 ForgeBlog/forgeblog/tests/functional/test_feeds.py | 4 ++--
 ForgeTracker/forgetracker/tracker_main.py          | 2 +-
 requirements.in                                    | 1 +
 requirements.txt                                   | 1 +
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index d2506e7..6bfe048 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -65,8 +65,7 @@ import formencode
 from jinja2 import Markup
 from jinja2.filters import contextfilter, escape, do_filesizeformat
 from paste.deploy.converters import asbool, aslist, asint
-
-from webhelpers import date, feedgenerator, html, number, misc, text
+from webhelpers import date, html, number, misc, text
 from webob.exc import HTTPUnauthorized
 
 from allura.lib import exceptions as exc
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index d3a6f1c..cc98b45 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -29,7 +29,7 @@ from ming.orm import state, session
 from ming.orm import FieldProperty, ForeignIdProperty, RelationProperty
 from ming.orm.declarative import MappedClass
 from ming.utils import LazyProperty
-from webhelpers import feedgenerator as FG
+import feedgenerator as FG
 
 from allura.lib import helpers as h
 from allura.lib import security
@@ -961,7 +961,7 @@ class Feed(MappedClass):
     @classmethod
     def feed(cls, q, feed_type, title, link, description,
              since=None, until=None, page=None, limit=None):
-        "Produces webhelper.feedgenerator Feed"
+        "Produces feedgenerator Feed"
         d = dict(title=title, link=h.absurl(h.urlquote(link)),
                  description=description, language='en',
                  feed_url=request.url)
diff --git a/ForgeActivity/forgeactivity/main.py b/ForgeActivity/forgeactivity/main.py
index 5f1c78b..0ee91d5 100644
--- a/ForgeActivity/forgeactivity/main.py
+++ b/ForgeActivity/forgeactivity/main.py
@@ -30,7 +30,7 @@ from tg import expose, validate, config
 from tg.decorators import with_trailing_slash, without_trailing_slash
 from paste.deploy.converters import asbool, asint
 from webob import exc
-from webhelpers import feedgenerator as FG
+import feedgenerator as FG
 from activitystream.storage.mingstorage import Activity
 
 from allura.app import Application
diff --git a/ForgeBlog/forgeblog/tests/functional/test_feeds.py b/ForgeBlog/forgeblog/tests/functional/test_feeds.py
index 2608ea8..f75ea4e 100644
--- a/ForgeBlog/forgeblog/tests/functional/test_feeds.py
+++ b/ForgeBlog/forgeblog/tests/functional/test_feeds.py
@@ -71,10 +71,10 @@ class TestFeeds(TestController):
     def test_rss_feed_contains_self_link(self):
         r = self.app.get('/blog/feed.rss')
         # atom namespace included
-        assert_in('<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">', r)
+        assert_in('<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">', r)
         # ...and atom:link points to feed url
         assert_in('<atom:link href="http://localhost/blog/feed.rss" '
-                  'type="application/rss+xml" rel="self"></atom:link>', r)
+                  'rel="self" type="application/rss+xml"></atom:link>', r)
 
     def test_post_feeds(self):
         self._post()
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 06cf18e..980ad5e 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -37,7 +37,7 @@ from formencode import validators
 from bson import ObjectId
 from bson.son import SON
 from bson.errors import InvalidId
-from webhelpers import feedgenerator as FG
+import feedgenerator as FG
 
 from ming import schema
 from ming.odm import session
diff --git a/requirements.in b/requirements.in
index 98e4dc7..83f8ccf 100644
--- a/requirements.in
+++ b/requirements.in
@@ -9,6 +9,7 @@ decorator
 EasyWidgets>=0.3.3
 emoji
 faulthandler ; python_version < "3.3"
+feedgenerator
 feedparser
 # FormEncode may need v2.0 to work past py3.3 or so?  https://github.com/formencode/formencode/issues/140
 FormEncode
diff --git a/requirements.txt b/requirements.txt
index 04f722d..97d5881 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -26,6 +26,7 @@ easywidgets==0.3.5
 emoji==0.5.3
 enum34==1.1.6             # via colander, cryptography, traitlets
 faulthandler==3.1 ; python_version < "3.3"
+feedgenerator==1.9.1
 feedparser==5.2.1
 formencode==1.3.1
 funcsigs==1.0.2           # via beaker, mock