projects
/
rss2maildir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Add https support (thanks to Andre Klärner)
[rss2maildir.git]
/
rss2maildir.py
diff --git
a/rss2maildir.py
b/rss2maildir.py
index 67121c53bd2c2fae93e6b8d4c48d0662d2a57055..b4acdec086d924bb9175c51dca551caf9ab07913 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
@@
-608,10
+612,17
@@
def open_url(method, url):
(type, rest) = urllib.splittype(url)
(host, path) = urllib.splithost(rest)
(host, port) = urllib.splitport(host)
(type, rest) = urllib.splittype(url)
(host, path) = urllib.splithost(rest)
(host, port) = urllib.splitport(host)
- if port == None:
+ if type == "https":
+ if port == None:
+ port = 443
+ elif port == None:
port = 80
try:
port = 80
try:
- conn = httplib.HTTPConnection("%s:%s" %(host, port))
+ conn = None
+ if type == "http":
+ conn = httplib.HTTPConnection("%s:%s" %(host, port))
+ else:
+ conn = httplib.HTTPSConnection("%s:%s" %(host, port))
conn.request(method, path)
response = conn.getresponse()
if response.status in [301, 302, 303, 307]:
conn.request(method, path)
response = conn.getresponse()
if response.status in [301, 302, 303, 307]: