Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the Issues #43 #49

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix the Issues #43 #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
075b458
Fix the Issues #43
linsir Aug 1, 2017
3dad4db
Change `connect_timeout`
linsir Aug 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions torndb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,17 +253,21 @@ def __getattr__(self, 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)
if MySQLdb.__package__ != 'pymysql':
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MySQLdb may be None (see the comments above about readthedocs). There is no guarantee that the __package__ attribute is present. I think it's better to set a variable in the import block at the top to say which module is in use.

# 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)

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 = [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] = [(FLAG.BINARY, str)] + CONVERSIONS[field_type]
else:
CONVERSIONS = {}

for field_type in field_types:
CONVERSIONS[field_type] = [(FLAG.BINARY, str)] + CONVERSIONS[field_type]

# Alias some common MySQL exceptions
IntegrityError = MySQLdb.IntegrityError
Expand Down