From: bdarnell <ben@bendarnell.com>
Date: Mon, 7 May 2012 04:43:25 +0000 (-0700)
Subject: Merge pull request #498 from mckoss/feature/set-option
X-Git-Tag: v2.3.0~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=625c6e052faa7bf7ec8b0bac14c240801c5d5f6a;p=thirdparty%2Ftornado.git

Merge pull request #498 from mckoss/feature/set-option

fix bug setting options programatically
---

625c6e052faa7bf7ec8b0bac14c240801c5d5f6a
diff --cc tornado/options.py
index e50dbfe23,91839d555..4e23684f1
--- a/tornado/options.py
+++ b/tornado/options.py
@@@ -229,10 -225,11 +234,10 @@@ class _Option(object)
              datetime.datetime: self._parse_datetime,
              datetime.timedelta: self._parse_timedelta,
              bool: self._parse_bool,
-             str: self._parse_string,
+             basestring: 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)