From 6675198ded779bf5e381f92f72987539a6de7117 Mon Sep 17 00:00:00 2001 From: Etienne Millon Date: Mon, 10 Dec 2012 14:50:21 +0100 Subject: [PATCH] Change default email address As discussed in [1], user@rss2email.invalid is less verbose and simpler to understand. [1]: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=464077 Reported-by: Noah Slater Signed-off-by: Etienne Millon --- r2e.1 | 2 +- rss2email/config.py | 2 +- rss2email/feed.py | 4 ++-- rss2email/feeds.py | 2 +- test/allthingsrss/1.expected | 40 ++++++++++++++++++------------------ test/gmane/1.expected | 20 +++++++++--------- 6 files changed, 35 insertions(+), 35 deletions(-) diff --git a/r2e.1 b/r2e.1 index 1645137..4cd9baa 100644 --- a/r2e.1 +++ b/r2e.1 @@ -118,7 +118,7 @@ setting to the feed-specific section. Here is an example overriding .RS 4 .nf [DEFAULT] -from = bozo@dev.null.invalid +from = user@rss2email.invalid force-from = False use-publisher-email = False friendly-name = True diff --git a/rss2email/config.py b/rss2email/config.py index 14df8e5..d8dc073 100644 --- a/rss2email/config.py +++ b/rss2email/config.py @@ -50,7 +50,7 @@ CONFIG = Config() CONFIG['DEFAULT'] = _collections.OrderedDict(( ### Addressing # The email address messages are from by default - ('from', 'bozo@dev.null.invalid'), + ('from', 'user@rss2email.invalid'), # True: Only use the 'from' address. # False: Use the email address specified by the feed, when possible. ('force-from', str(False)), diff --git a/rss2email/feed.py b/rss2email/feed.py index 69c3db5..60f00e4 100644 --- a/rss2email/feed.py +++ b/rss2email/feed.py @@ -72,13 +72,13 @@ class Feed (object): >>> feed.section 'feed.test-feed' >>> feed.from_email - 'bozo@dev.null.invalid' + 'user@rss2email.invalid' >>> feed.from_email = 'a@b.com' >>> feed.save_to_config() >>> feed.config.write(sys.stdout) # doctest: +REPORT_UDIFF, +ELLIPSIS [DEFAULT] - from = bozo@dev.null.invalid + from = user@rss2email.invalid ... verbose = warning diff --git a/rss2email/feeds.py b/rss2email/feeds.py index c4acdaf..18fe242 100644 --- a/rss2email/feeds.py +++ b/rss2email/feeds.py @@ -100,7 +100,7 @@ class Feeds (list): >>> print(open(configfile, 'r').read().rstrip('\\n')) ... # doctest: +REPORT_UDIFF, +ELLIPSIS [DEFAULT] - from = bozo@dev.null.invalid + from = user@rss2email.invalid ... verbose = warning diff --git a/test/allthingsrss/1.expected b/test/allthingsrss/1.expected index 590888c..5e6258e 100644 --- a/test/allthingsrss/1.expected +++ b/test/allthingsrss/1.expected @@ -1,8 +1,8 @@ -SENT BY: "rss2email: Lindsey Smith" +SENT BY: "rss2email: Lindsey Smith" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -From: "rss2email: Lindsey Smith" +From: "rss2email: Lindsey Smith" To: a@b.com Subject: Version 2.67 Released Date: Tue, 21 Sep 2010 16:55:07 -0000 @@ -42,11 +42,11 @@ Lq2dNKzkelsypiC4fjPLM/1/da) URL: http://feedproxy.google.com/~r/allthingsrss/hJBr/~3/aGbf5Gefkmc/ -SENT BY: "rss2email: Lindsey Smith" +SENT BY: "rss2email: Lindsey Smith" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -From: "rss2email: Lindsey Smith" +From: "rss2email: Lindsey Smith" To: a@b.com Subject: Version 2.68 Released with Actual New Features Date: Fri, 01 Oct 2010 18:21:26 -0000 @@ -99,11 +99,11 @@ tp://feedads.g.doubleclick.net/~a/nYgTsIUsS9pmvRZ6092XGGHnNKg/1/da) URL: http://feedproxy.google.com/~r/allthingsrss/hJBr/~3/bT-I0iH2vw8/ -SENT BY: "rss2email: Lindsey Smith" +SENT BY: "rss2email: Lindsey Smith" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -From: "rss2email: Lindsey Smith" +From: "rss2email: Lindsey Smith" To: a@b.com Subject: How to Read RSS Feeds in Emacs Date: Fri, 05 Nov 2010 17:36:14 -0000 @@ -131,11 +131,11 @@ tp://feedads.g.doubleclick.net/~a/W185EjeIKKNPfRCWp9sV0gDrfJk/1/da) URL: http://feedproxy.google.com/~r/allthingsrss/hJBr/~3/JryfOLe_q6c/ -SENT BY: "rss2email: Lindsey Smith" +SENT BY: "rss2email: Lindsey Smith" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -From: "rss2email: Lindsey Smith" +From: "rss2email: Lindsey Smith" To: a@b.com Subject: Version 2.69 Released Date: Fri, 12 Nov 2010 18:45:08 -0000 @@ -173,11 +173,11 @@ tp://feedads.g.doubleclick.net/~a/ygS5IVjPi9xnNjTZA1SFTAzPtuA/1/da) URL: http://feedproxy.google.com/~r/allthingsrss/hJBr/~3/ubaE55Le1OU/ -SENT BY: "rss2email: Lindsey Smith" +SENT BY: "rss2email: Lindsey Smith" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -From: "rss2email: Lindsey Smith" +From: "rss2email: Lindsey Smith" To: a@b.com Subject: Minor Correction to v2.69 Packages Date: Fri, 10 Dec 2010 17:47:58 -0000 @@ -207,11 +207,11 @@ tp://feedads.g.doubleclick.net/~a/V9Hd_J59X3SfWg3Q2XbjLNcdusA/1/da) URL: http://feedproxy.google.com/~r/allthingsrss/hJBr/~3/CiODBX5_NSk/ -SENT BY: "rss2email: Lindsey Smith" +SENT BY: "rss2email: Lindsey Smith" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -From: "rss2email: Lindsey Smith" +From: "rss2email: Lindsey Smith" To: a@b.com Subject: Minor correction to the minor correction: v2.69a released Date: Mon, 13 Dec 2010 18:04:20 -0000 @@ -250,11 +250,11 @@ SAzQ6UihM/1/da) URL: http://feedproxy.google.com/~r/allthingsrss/hJBr/~3/VgWvylH6fvk/ -SENT BY: "rss2email: Lindsey Smith" +SENT BY: "rss2email: Lindsey Smith" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -From: "rss2email: Lindsey Smith" +From: "rss2email: Lindsey Smith" To: a@b.com Subject: Mac OS X and rss2email are Compatible Date: Fri, 17 Dec 2010 20:54:27 -0000 @@ -287,11 +287,11 @@ try resolve incompatibilities if possible. URL: http://feedproxy.google.com/~r/allthingsrss/hJBr/~3/cILvxh4ziQg/ -SENT BY: "rss2email: Lindsey Smith" +SENT BY: "rss2email: Lindsey Smith" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -From: "rss2email: Lindsey Smith" +From: "rss2email: Lindsey Smith" To: a@b.com Subject: Version 2.70 Released Date: Tue, 21 Dec 2010 20:00:49 -0000 @@ -326,11 +326,11 @@ tp://feedads.g.doubleclick.net/~a/3-mTadqlwiwGd3BGVmqYMI2xAyg/1/da) URL: http://feedproxy.google.com/~r/allthingsrss/hJBr/~3/0rUaRcCJ8dU/ -SENT BY: "rss2email: Lindsey Smith" +SENT BY: "rss2email: Lindsey Smith" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -From: "rss2email: Lindsey Smith" +From: "rss2email: Lindsey Smith" To: a@b.com Subject: Version 2.71 Release plus Other Major Updates Date: Fri, 04 Mar 2011 18:03:11 -0000 @@ -371,11 +371,11 @@ IMAOP4LbS0/1/da) URL: http://feedproxy.google.com/~r/allthingsrss/hJBr/~3/wsLSVDNzno0/ -SENT BY: "rss2email: Lindsey Smith" +SENT BY: "rss2email: Lindsey Smith" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -From: "rss2email: Lindsey Smith" +From: "rss2email: Lindsey Smith" To: a@b.com Subject: Mac OS, rss2email and scheduling with launchd Date: Tue, 23 Aug 2011 15:57:37 -0000 diff --git a/test/gmane/1.expected b/test/gmane/1.expected index 2fa9d54..14ee0f8 100644 --- a/test/gmane/1.expected +++ b/test/gmane/1.expected @@ -1,8 +1,8 @@ -SENT BY: "gmane.mail.rss2email: W. Trevor King" +SENT BY: "gmane.mail.rss2email: W. Trevor King" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -From: "gmane.mail.rss2email: W. Trevor King" +From: "gmane.mail.rss2email: W. Trevor King" To: a@b.com Subject: Re: new maintainer and mailing list for rss2email Date: Mon, 12 Nov 2012 21:20:22 -0000 @@ -48,11 +48,11 @@ Alrighty, this is the first email on the list and also my first URL: http://permalink.gmane.org/gmane.mail.rss2email/1 -SENT BY: "gmane.mail.rss2email: Etienne Millon" +SENT BY: "gmane.mail.rss2email: Etienne Millon" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -From: "gmane.mail.rss2email: Etienne Millon" +From: "gmane.mail.rss2email: Etienne Millon" To: a@b.com Subject: Re: new maintainer and mailing list for rss2email Date: Tue, 13 Nov 2012 10:48:07 -0000 @@ -87,11 +87,11 @@ X-RSS-URL: http://permalink.gmane.org/gmane.mail.rss2email/2 URL: http://permalink.gmane.org/gmane.mail.rss2email/2 -SENT BY: "gmane.mail.rss2email: W. Trevor King" +SENT BY: "gmane.mail.rss2email: W. Trevor King" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -From: "gmane.mail.rss2email: W. Trevor King" +From: "gmane.mail.rss2email: W. Trevor King" To: a@b.com Subject: Re: new maintainer and mailing list for rss2email Date: Tue, 13 Nov 2012 12:20:20 -0000 @@ -110,11 +110,11 @@ X-RSS-URL: http://permalink.gmane.org/gmane.mail.rss2email/3 URL: http://permalink.gmane.org/gmane.mail.rss2email/3 -SENT BY: "gmane.mail.rss2email: Etienne Millon" +SENT BY: "gmane.mail.rss2email: Etienne Millon" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -From: "gmane.mail.rss2email: Etienne Millon" +From: "gmane.mail.rss2email: Etienne Millon" To: a@b.com Subject: Re: new maintainer and mailing list for rss2email Date: Tue, 13 Nov 2012 12:42:13 -0000 @@ -136,11 +136,11 @@ X-RSS-URL: http://permalink.gmane.org/gmane.mail.rss2email/4 URL: http://permalink.gmane.org/gmane.mail.rss2email/4 -SENT BY: "gmane.mail.rss2email: W. Trevor King" +SENT BY: "gmane.mail.rss2email: W. Trevor King" MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit -From: "gmane.mail.rss2email: W. Trevor King" +From: "gmane.mail.rss2email: W. Trevor King" To: a@b.com Subject: split massive package into modules Date: Tue, 13 Nov 2012 14:36:22 -0000 -- 2.26.2