rschaten/Atomstrom
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

optionparser is deprecated, use argumentparser instead

Browse Source
This commit is contained in:
Ronald Schaten
2013-04-03 22:49:53 +02:00
parent 6c358c5c1d
commit e452db9cc8
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
atomstrom.py
View File

@@ -15,7 +15,7 @@ import urllib2
#import hn #import hn
import html2text import html2text
import ConfigParser import ConfigParser
from optparse import OptionParser from argparse import ArgumentParser
from cStringIO import StringIO from cStringIO import StringIO
from email.mime.multipart import MIMEMultipart from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText from email.mime.text import MIMEText
@@ -243,25 +243,25 @@ if __name__ == '__main__':
#session.add(Feed('http://www.heise.de/newsticker/heise-atom.xml', 1, 0, 0, 1, 1)) #session.add(Feed('http://www.heise.de/newsticker/heise-atom.xml', 1, 0, 0, 1, 1))
#session.add(Feed('http://blog.schatenseite.de/feed/', 1, 0, 0, 1, 1)) #session.add(Feed('http://blog.schatenseite.de/feed/', 1, 0, 0, 1, 1))
parser = OptionParser() parser = ArgumentParser(description='Fetch RSS- and Atom-feeds and send mails.')
parser.add_option("-f", "--fetch", action="store_true", dest="fetch", default=False, help="fetch all feeds") parser.add_argument('-f', '--fetch', action='store_true', help='fetch all feeds')
parser.add_option("-s", "--single", action="store_true", dest="single", default=False, help="send single mails") parser.add_argument('-s', '--single', action='store_true', help='send single mails')
parser.add_option("-d", "--daily", action="store_true", dest="daily", default=False, help="send daily digest") parser.add_argument('-d', '--daily', action='store_true', help='send daily digest')
(options, args) = parser.parse_args() args = parser.parse_args()
if options.fetch: if args.fetch:
fetch_all_feeds(session) fetch_all_feeds(session)
if options.single: if args.single:
sender = [config.get('email', 'sender_name'), config.get('email', 'sender_address')] sender = [config.get('email', 'sender_name'), config.get('email', 'sender_address')]
receiver = [config.get('email', 'receiver_name'), config.get('email', 'receiver_address')] receiver = [config.get('email', 'receiver_name'), config.get('email', 'receiver_address')]
prefix = config.get('email', 'prefix_single') prefix = config.get('email', 'prefix_single')
mail_single_entries(session, sender, receiver, prefix) mail_single_entries(session, sender, receiver, prefix)
if options.daily: if args.daily:
sender = [config.get('email', 'sender_name'), config.get('email', 'sender_address')] sender = [config.get('email', 'sender_name'), config.get('email', 'sender_address')]
receiver = [config.get('email', 'receiver_name'), config.get('email', 'receiver_address')] receiver = [config.get('email', 'receiver_name'), config.get('email', 'receiver_address')]
prefix = config.get('email', 'prefix_digest') prefix = config.get('email', 'prefix_digest')
mail_daily_digest(session, sender, receiver, prefix) mail_daily_digest(session, sender, receiver, prefix)
if not (options.fetch or options.single or options.daily): if not (args.fetch or args.single or args.daily):
parser.print_help() parser.print_help()
session.commit() session.commit()