From: Robert Buchholz <rbu@goodpoint.de>
Date: Tue, 13 Jul 2010 08:28:52 +0000 (+0200)
Subject: Make iteration over sql fields clearer
X-Git-Tag: v1.0.0~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2181b035b216c60bd1b67736ca334562c0e9c84;p=thirdparty%2Ftornado.git

Make iteration over sql fields clearer
---

diff --git a/tornado/database.py b/tornado/database.py
index 22c745492..c273ace4a 100644
--- a/tornado/database.py
+++ b/tornado/database.py
@@ -166,9 +166,12 @@ class Row(dict):
 FIELD_TYPE = MySQLdb.constants.FIELD_TYPE
 FLAG = MySQLdb.constants.FLAG
 CONVERSIONS = copy.deepcopy(MySQLdb.converters.conversions)
-for field_type in \
-        [FIELD_TYPE.BLOB, FIELD_TYPE.STRING, FIELD_TYPE.VAR_STRING] + \
-        ([FIELD_TYPE.VARCHAR] if 'VARCHAR' in vars(FIELD_TYPE) else []):
+
+field_types = [FIELD_TYPE.BLOB, FIELD_TYPE.STRING, FIELD_TYPE.VAR_STRING]
+if 'VARCHAR' in vars(FIELD_TYPE):
+    field_types.append([FIELD_TYPE.VARCHAR])
+
+for field_type in field_types:
     CONVERSIONS[field_type].insert(0, (FLAG.BINARY, str))