Mercurial > hg > Feedworm
diff util.py @ 37:22214d79ed41
database URL must be given as commandline argument now, no need for creating complicated config files. Add a menu entry for opening the selected article in browser.
author | Dirk Olmes <dirk@xanthippe.ping.de> |
---|---|
date | Fri, 14 May 2010 06:16:05 +0200 |
parents | aaec263f07ca |
children | 12ed8b5fa08c |
line wrap: on
line diff
--- a/util.py Wed May 05 03:10:15 2010 +0200 +++ b/util.py Fri May 14 06:16:05 2010 +0200 @@ -1,9 +1,7 @@ -from ConfigParser import ConfigParser from datetime import datetime, timedelta from Feed import Feed import logging -import socket logger = logging.getLogger("database") @@ -12,15 +10,6 @@ logging.getLogger("sqlalchemy").setLevel(logging.INFO) logging.getLogger("sqlalchemy.orm").setLevel(logging.WARN) -def loadDatabaseUrl(): - hostname = socket.gethostname() - filename = "database-%s.ini" % hostname - logger.debug("loading database configuration from " + filename) - - parser = ConfigParser(); - parser.read(filename) - return parser.get("database", "url") - def loadFeeds(session=None, filename="feeds.txt"): file = open(filename) for line in file: