From: Adam Sampson <ats@offog.org>
Date: Fri, 30 Jan 2009 09:03:20 +0000 (+0000)
Subject: "as" is now a reserved word in Python 2.6.
X-Git-Tag: v2.12rc3~3
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=7cf15f87a926099e91f0bd8c668b9a983cea3e3d;p=rawdog%2F.git

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

diff --git a/NEWS b/NEWS
index 8330f9b..ce59a8a 100644
--- 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 a52cceb..2a790ef 100644
--- 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