Make confvalue() never return None

ept · ept · commit 0dcfadee6adf · 2012-07-03T10:14:35.000+01:00
There are three places in the code where the return value of confvalue()
is concatenated with a string, which fails if the value is None. Rather
than changing them all, I thought it would be better to make confvalue()
return an empty string if the configuration for that value is absent.
diff --git a/bin/storm b/bin/storm
@@ -62,6 +62,7 @@ def confvalue(name, extrapaths):
         tokens = line.split(" ")
         if tokens[0] == "VALUE:":
             return " ".join(tokens[1:])
+    return ""
 
 def print_localconfvalue(name):
     """Syntax: [storm localconfvalue conf-name]
@@ -97,7 +98,7 @@ def parse_args(string):
         '(?: [^'\\] | \\.)*' |
         \\.
     )+)''', re.VERBOSE)
-    args = re_split.split(string or '')[1::2]
+    args = re_split.split(string)[1::2]
     args = [re.compile(r'"((?:[^"\\]|\\.)*)"').sub('\\1', x) for x in args]
     args = [re.compile(r"'((?:[^'\\]|\\.)*)'").sub('\\1', x) for x in args]
     return [re.compile(r'\\(.)').sub('\\1', x) for x in args]
