From: Lindsey Smith <lindsey.smith@gmail.com>
Date: Mon, 14 Jan 2008 12:00:00 +0000 (+0000)
Subject: Add rss2email v2.62
X-Git-Tag: v2.62
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f5f70210178a43eac1dab8623d19dec81fa161c5;p=rss2email.git

Add rss2email v2.62

Bug-fix version:
* Simplified SunOS fix
* Local feeds (/home/user/file.xml) should work

Downloaded from:

  http://web.archive.org/web/20080228225122/http://rss2email.infogami.com/rss2email.py

and filtered through dos2unix.
---

diff --git a/rss2email.py b/rss2email.py
index c81c226..a5affdf 100644
--- a/rss2email.py
+++ b/rss2email.py
@@ -10,7 +10,7 @@ Usage:
   list
   delete n
 """
-__version__ = "2.61"
+__version__ = "2.62"
 __author__ = "Aaron Swartz (me@aaronsw.com)"
 __copyright__ = "(C) 2004 Aaron Swartz. GNU GPL 2."
 ___contributors__ = ["Dean Jackson", "Brian Lalor", "Joey Hess", 
@@ -218,8 +218,7 @@ import cPickle as pickle, md5, time, os, traceback, urllib2, sys, types
 unix = 0
 try:
 	import fcntl
-	if sys.version.find('sunos') == -1:
-		unix = 1
+	unix = 1
 except:
 	pass
 		
@@ -351,7 +350,7 @@ def getName(r, entry):
 	"""Get the best name."""
 
 	feed = r.feed
-	if r.url in OVERRIDE_FROM.keys():
+	if hasattr(r, "url") and r.url in OVERRIDE_FROM.keys():
 		return OVERRIDE_FROM[r.url]
 	
 	name = feed.get('title', '')