--- a/pvl/args.py Wed Oct 30 20:35:50 2013 +0200
+++ b/pvl/args.py Mon Nov 04 19:45:55 2013 +0200
@@ -136,7 +136,7 @@
# configure
logging.basicConfig(
# XXX: log Class.__init__ as Class, not __init__?
- format = prefix + '%(name)-20s: %(levelname)5s %(funcName)s: %(message)s',
+ format = prefix + '%(levelname)8s %(name)20s.%(funcName)s: %(message)s',
level = options.loglevel,
filename = options.log_file,
)
--- a/pvl/socket.py Wed Oct 30 20:35:50 2013 +0200
+++ b/pvl/socket.py Mon Nov 04 19:45:55 2013 +0200
@@ -12,6 +12,8 @@
import urlparse
import logging; log = logging.getLogger('pvl.socket')
+from socket import SOCK_STREAM
+
def parse (url, port=None) :
"""
Parse given string into host, port, path parts.
@@ -58,7 +60,7 @@
family = socket.AF_UNIX
if family == socket.AF_UNIX :
- raise ValueError("TODO: AF_UNIX is not yet supported", str)
+ raise ValueError("TODO: AF_UNIX is not yet supported: %s" % (url, ))
else : # AF_UNSPEC or AF_INET/AF_INET6
return connect_inet(socktype, host, port, family=family)
--- a/pvl/syslog/fifo.py Wed Oct 30 20:35:50 2013 +0200
+++ b/pvl/syslog/fifo.py Mon Nov 04 19:45:55 2013 +0200
@@ -149,7 +149,7 @@
# pull line
line = self.readline()
- if line :
+ if line is not None :
yield line
else :
return # block