From 71edfb4109ef0fd7866054d63d2cda6a879b15d3 Mon Sep 17 00:00:00 2001 From: Mike Blume Date: Thu, 22 Aug 2013 13:45:11 -0700 Subject: [PATCH 1/2] make these facilities a bit more readable --- configure-syslog.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure-syslog.py b/configure-syslog.py index f777a91..1931794 100644 --- a/configure-syslog.py +++ b/configure-syslog.py @@ -226,14 +226,14 @@ } # log facilities... -LOG_FACILITIES = { - "kern": 0 << 3, "user": 1 << 3, "mail": 2 << 3, "daemon": 3 << 3, - "auth": 4 << 3, "syslog": 5 << 3, "lpr": 6 << 3, "news": 7 << 3, - "uucp": 8 << 3, "cron": 9 << 3, "security": 10 << 3, "ftp": 11 << 3, - "ntp": 12 << 3, "logaudit": 13 << 3, "logalert": 14 << 3, "clock": 15 << 3, - "local0": 16 << 3, "local1": 17 << 3, "local2": 18 << 3, "local3": 19 << 3, - "local4": 20 << 3, "local5": 21 << 3, "local6": 22 << 3, "local7": 23 << 3 - } +LOG_FACILITIES = dict([(k, v << 3) for k,v in { + "kern": 0, "user": 1, "mail": 2, "daemon": 3, + "auth": 4, "syslog": 5, "lpr": 6, "news": 7, + "uucp": 8, "cron": 9, "security": 10, "ftp": 11, + "ntp": 12, "logaudit": 13, "logalert": 14, "clock": 15, + "local0": 16, "local1": 17, "local2": 18, "local3": 19, + "local4": 20, "local5": 21, "local6": 22, "local7": 23 +}.items()]) PYTHON_FAIL = "pythonfail" PS_FAIL = "psfail" From 6e6c8203eb550f9a63fa68b83a4fbf46efd5633c Mon Sep 17 00:00:00 2001 From: Mike Blume Date: Thu, 22 Aug 2013 13:49:22 -0700 Subject: [PATCH 2/2] note --- configure-syslog.py | 1 + 1 file changed, 1 insertion(+) diff --git a/configure-syslog.py b/configure-syslog.py index 1931794..e9a9883 100644 --- a/configure-syslog.py +++ b/configure-syslog.py @@ -226,6 +226,7 @@ } # log facilities... +# (avoiding a dict comprehension for Python 2.6 compat) LOG_FACILITIES = dict([(k, v << 3) for k,v in { "kern": 0, "user": 1, "mail": 2, "daemon": 3, "auth": 4, "syslog": 5, "lpr": 6, "news": 7,