projects
/
rss2maildir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update so that we don't get a warning in python 2.6 and above, where the md5 module...
[rss2maildir.git]
/
rss2maildir.py
diff --git
a/rss2maildir.py
b/rss2maildir.py
index 533e34d614c810bda43514a118f1677dcfaffe4f..a1e8819f8fcb067eff4cb892c70a460bc6b294c7 100755
(executable)
--- a/
rss2maildir.py
+++ b/
rss2maildir.py
@@
-39,7
+39,11
@@
from optparse import OptionParser
from ConfigParser import SafeConfigParser
from base64 import b64encode
from ConfigParser import SafeConfigParser
from base64 import b64encode
-import md5
+
+if sys.version_info[0] == 2 and sys.version_info[1] >= 6:
+ import hashlib as md5
+else:
+ import md5
import cgi
import dbm
import cgi
import dbm
@@
-692,12
+696,13
@@
def parse_and_deliver(maildir, url, statedir):
prevmessageid = None
prevmessageid = None
- db_guid_key =
(url + u'|' + item["guid"]).encode("utf-8")
+ db_guid_key =
None
db_link_key = (url + u'|' + item["link"]).encode("utf-8")
# check if there's a guid too - if that exists and we match the md5,
# return
if item.has_key("guid"):
db_link_key = (url + u'|' + item["link"]).encode("utf-8")
# check if there's a guid too - if that exists and we match the md5,
# return
if item.has_key("guid"):
+ db_guid_key = (url + u'|' + item["guid"]).encode("utf-8")
if db.has_key(db_guid_key):
data = db[db_guid_key]
data = cgi.parse_qs(data)
if db.has_key(db_guid_key):
data = db[db_guid_key]
data = cgi.parse_qs(data)
@@
-741,6
+746,8
@@
def parse_and_deliver(maildir, url, statedir):
except:
pass
msg.add_header("Date", createddate)
except:
pass
msg.add_header("Date", createddate)
+ msg.add_header("X-rss2maildir-rundate", datetime.datetime.now() \
+ .strftime("%a, %e %b %Y %T -0000"))
subj_gen = HTML2Text()
title = item["title"]
title = re.sub(u'<', u'<', title)
subj_gen = HTML2Text()
title = item["title"]
title = re.sub(u'<', u'<', title)