Permalink
Browse files

Merge pull request #484 from vadimg/master

make commandline args override config file args when multiple=True
  • Loading branch information...
2 parents fde872d + 92d1eb0 commit de3cf92a962f346c666ddc138aa1e6ec84b99d4b @bdarnell bdarnell committed May 7, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −2 tornado/options.py
View
@@ -232,8 +232,7 @@ def parse(self, value):
str: self._parse_string,
}.get(self.type, self.type)
if self.multiple:
- if self._value is None:
- self._value = []
+ self._value = []
for part in value.split(","):
if self.type in (int, long):
# allow ranges of the form X:Y (inclusive at both ends)

0 comments on commit de3cf92

Please sign in to comment.