From: Vadim Graboys <vadim@chartbeat.com>
Date: Tue, 27 Mar 2012 19:17:48 +0000 (-0400)
Subject: fix handling of multiple commandline args
X-Git-Tag: v2.3.0~35^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F484%2Fhead;p=thirdparty%2Ftornado.git

fix handling of multiple commandline args

make commandline args override config file args when multiple=True
instead of appending to config file args
---

diff --git a/tornado/options.py b/tornado/options.py
index feae3292c..e12adb957 100644
--- a/tornado/options.py
+++ b/tornado/options.py
@@ -223,8 +223,7 @@ class _Option(object):
             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)