Rooba
/
tornado
mirror of https://github.com/tornadoweb/tornado.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make tornado.database importable when MySQLdb is not available. 

This fixes the docs build on readthedocs.org.

Closes #485.
This commit is contained in:
Ben Darnell 2012-04-01 14:41:47 -07:00
parent 2ff579a65c
commit 38908bf6b7
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tornado/database.py
View File

@ -19,13 +19,19 @@
from __future__ import absolute_import, division, with_statement from __future__ import absolute_import, division, with_statement
import copy import copy
import MySQLdb.constants
import MySQLdb.converters
import MySQLdb.cursors
import itertools import itertools
import logging import logging
import time import time
try:
import MySQLdb.constants
import MySQLdb.converters
import MySQLdb.cursors
except ImportError:
# If MySQLdb isn't available this module won't actually be useable,
# but we want it to at least be importable (mainly for readthedocs.org,
# which has limitations on third-party modules)
MySQLdb = None
class Connection(object): class Connection(object):
"""A lightweight wrapper around MySQLdb DB-API connections. """A lightweight wrapper around MySQLdb DB-API connections.
@ -213,20 +219,20 @@ class Row(dict):
except KeyError: except KeyError:
raise AttributeError(name) raise AttributeError(name)
if MySQLdb is not None:
# Fix the access conversions to properly recognize unicode/binary
FIELD_TYPE = MySQLdb.constants.FIELD_TYPE
FLAG = MySQLdb.constants.FLAG
CONVERSIONS = copy.copy(MySQLdb.converters.conversions)
# Fix the access conversions to properly recognize unicode/binary field_types = [FIELD_TYPE.BLOB, FIELD_TYPE.STRING, FIELD_TYPE.VAR_STRING]
FIELD_TYPE = MySQLdb.constants.FIELD_TYPE if 'VARCHAR' in vars(FIELD_TYPE):
FLAG = MySQLdb.constants.FLAG
CONVERSIONS = copy.copy(MySQLdb.converters.conversions)
field_types = [FIELD_TYPE.BLOB, FIELD_TYPE.STRING, FIELD_TYPE.VAR_STRING]
if 'VARCHAR' in vars(FIELD_TYPE):
field_types.append(FIELD_TYPE.VARCHAR) field_types.append(FIELD_TYPE.VARCHAR)
for field_type in field_types: for field_type in field_types:
CONVERSIONS[field_type] = [(FLAG.BINARY, str)] + CONVERSIONS[field_type] CONVERSIONS[field_type] = [(FLAG.BINARY, str)] + CONVERSIONS[field_type]
# Alias some common MySQL exceptions # Alias some common MySQL exceptions
IntegrityError = MySQLdb.IntegrityError IntegrityError = MySQLdb.IntegrityError
OperationalError = MySQLdb.OperationalError OperationalError = MySQLdb.OperationalError