Merge branch 'ssl-protocol'

[rss2email.git] / rss2email / feed.py

diff --git a/rss2email/feed.py b/rss2email/feed.py
index a11f6c7bfb2edb5042bd2eae42bf7b107546f342..b2c1350b6135e96f94eef9dede52dd27c4202d8a 100644 (file)
--- a/rss2email/feed.py
+++ b/rss2email/feed.py
@@ -57,7 +57,7 @@ from . import error as _error
 from . import util as _util
 
 
-_USER_AGENT = 'rss2email/{} +{}'.format(__version__, __url__)
+_USER_AGENT = 'rss2email/{} ({})'.format(__version__, __url__)
 _feedparser.USER_AGENT = _USER_AGENT
 _urllib_request.install_opener(_urllib_request.build_opener())
 _SOCKET_ERRORS = []
@@ -180,6 +180,7 @@ class Feed (object):
         'active',
         'date_header',
         'trust_guid',
+        'trust_link',
         'html_mail',
         'use_css',
         'unicode_snob',
@@ -498,6 +499,8 @@ class Feed (object):
 
     def _get_entry_id(self, entry):
         """Get best ID from an entry."""
+        if self.trust_link:
+            return entry.get('link', None)
         if self.trust_guid:
             if getattr(entry, 'id', None):
                 # Newer versions of feedparser could return a dictionary