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 <nslater@bytesexual.org>
Signed-off-by: Etienne Millon <me@emillon.org>

diff --git a/r2e.1 b/r2e.1
index 16451370b15fb91bd340f1654d6e267c9956d134..4cd9baade6f342a9b7443882c22be75aff3e7967 100644 (file)
--- 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 14df8e5df61a68b85ae3cc980d839600fd0b61ba..d8dc0731ecd9ee6d9e32a711f0de9287ac0b4740 100644 (file)
--- 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 69c3db53bc4cf82cfde907b07f0e9b89b1581509..60f00e49a7ebb74a253078e1567409fe6e9b6cd6 100644 (file)
--- 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
     <BLANKLINE>

diff --git a/rss2email/feeds.py b/rss2email/feeds.py
index c4acdaf8961d593510756c5d3ab44341b9e994f6..18fe24298f1825fb0ad839997e2cafc42ee8e1b7 100644 (file)
--- 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
     <BLANKLINE>

diff --git a/test/allthingsrss/1.expected b/test/allthingsrss/1.expected
index 590888c5d412cd18a211f7de0b702ac0574476a5..5e6258e7a0d069813dc7e864629b65a7129d7831 100644 (file)
--- a/test/allthingsrss/1.expected
+++ b/test/allthingsrss/1.expected
@@ -1,8 +1,8 @@
-SENT BY: "rss2email: Lindsey Smith" <bozo@dev.null.invalid>
+SENT BY: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-From: "rss2email: Lindsey Smith" <bozo@dev.null.invalid>
+From: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 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" <bozo@dev.null.invalid>
+SENT BY: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-From: "rss2email: Lindsey Smith" <bozo@dev.null.invalid>
+From: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 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" <bozo@dev.null.invalid>
+SENT BY: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-From: "rss2email: Lindsey Smith" <bozo@dev.null.invalid>
+From: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 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" <bozo@dev.null.invalid>
+SENT BY: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-From: "rss2email: Lindsey Smith" <bozo@dev.null.invalid>
+From: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 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" <bozo@dev.null.invalid>
+SENT BY: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-From: "rss2email: Lindsey Smith" <bozo@dev.null.invalid>
+From: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 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" <bozo@dev.null.invalid>
+SENT BY: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-From: "rss2email: Lindsey Smith" <bozo@dev.null.invalid>
+From: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 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" <bozo@dev.null.invalid>
+SENT BY: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-From: "rss2email: Lindsey Smith" <bozo@dev.null.invalid>
+From: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 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" <bozo@dev.null.invalid>
+SENT BY: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-From: "rss2email: Lindsey Smith" <bozo@dev.null.invalid>
+From: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 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" <bozo@dev.null.invalid>
+SENT BY: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-From: "rss2email: Lindsey Smith" <bozo@dev.null.invalid>
+From: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 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" <bozo@dev.null.invalid>
+SENT BY: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-From: "rss2email: Lindsey Smith" <bozo@dev.null.invalid>
+From: "rss2email: Lindsey Smith" <user@rss2email.invalid>
 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 2fa9d54909dce0912988d92f7e5a57a7749cd02e..14ee0f8469ce4c2b183033d3c09add5f7cc4212f 100644 (file)
--- a/test/gmane/1.expected
+++ b/test/gmane/1.expected
@@ -1,8 +1,8 @@
-SENT BY: "gmane.mail.rss2email: W. Trevor King" <bozo@dev.null.invalid>
+SENT BY: "gmane.mail.rss2email: W. Trevor King" <user@rss2email.invalid>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-From: "gmane.mail.rss2email: W. Trevor King" <bozo@dev.null.invalid>
+From: "gmane.mail.rss2email: W. Trevor King" <user@rss2email.invalid>
 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" <bozo@dev.null.invalid>
+SENT BY: "gmane.mail.rss2email: Etienne Millon" <user@rss2email.invalid>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-From: "gmane.mail.rss2email: Etienne Millon" <bozo@dev.null.invalid>
+From: "gmane.mail.rss2email: Etienne Millon" <user@rss2email.invalid>
 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" <bozo@dev.null.invalid>
+SENT BY: "gmane.mail.rss2email: W. Trevor King" <user@rss2email.invalid>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-From: "gmane.mail.rss2email: W. Trevor King" <bozo@dev.null.invalid>
+From: "gmane.mail.rss2email: W. Trevor King" <user@rss2email.invalid>
 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" <bozo@dev.null.invalid>
+SENT BY: "gmane.mail.rss2email: Etienne Millon" <user@rss2email.invalid>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-From: "gmane.mail.rss2email: Etienne Millon" <bozo@dev.null.invalid>
+From: "gmane.mail.rss2email: Etienne Millon" <user@rss2email.invalid>
 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" <bozo@dev.null.invalid>
+SENT BY: "gmane.mail.rss2email: W. Trevor King" <user@rss2email.invalid>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Content-Transfer-Encoding: 7bit
-From: "gmane.mail.rss2email: W. Trevor King" <bozo@dev.null.invalid>
+From: "gmane.mail.rss2email: W. Trevor King" <user@rss2email.invalid>
 To: a@b.com
 Subject: split massive package into modules
 Date: Tue, 13 Nov 2012 14:36:22 -0000