"as" is now a reserved word in Python 2.6.

diff --git a/NEWS b/NEWS
index 8330f9b104db10ee5d953995cc59ff107b9f3eda..ce59a8a8a8dd21e5b33765d6e0cb15b20cd7f686 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 - rawdog 2.12
 
+Make rawdog work with Python 2.6 (reported by Roy Lanek).
+
 Several changes as a result of profiling that significantly speed up
 writing output files:
 

diff --git a/rawdoglib/rawdog.py b/rawdoglib/rawdog.py
index a52ccebebbb64dc34159eb8955759e9fcf2513c2..2a790efee961a22be0527243ca4af7dac5dec1bf 100644 (file)
--- a/rawdoglib/rawdog.py
+++ b/rawdoglib/rawdog.py
@@ -607,16 +607,16 @@ def parse_list(value):
 def parse_feed_args(argparams, arglines):
        """Parse a list of feed arguments. Raise ConfigError if the syntax is invalid."""
        args = {}
-       for a in argparams:
-               as = a.split("=", 1)
-               if len(as) != 2:
-                       raise ConfigError("Bad feed argument in config: " + a)
-               args[as[0]] = as[1]
-       for a in arglines:
-               as = a.split(None, 1)
-               if len(as) != 2:
-                       raise ConfigError("Bad argument line in config: " + a)
-               args[as[0]] = as[1]
+       for p in argparams:
+               ps = a.split("=", 1)
+               if len(ps) != 2:
+                       raise ConfigError("Bad feed argument in config: " + p)
+               args[ps[0]] = ps[1]
+       for p in arglines:
+               ps = a.split(None, 1)
+               if len(ps) != 2:
+                       raise ConfigError("Bad argument line in config: " + p)
+               args[ps[0]] = ps[1]
        if "maxage" in args:
                args["maxage"] = parse_time(args["maxage"])
        return args