__init__.py | __init__.py | |||
---|---|---|---|---|
skipping to change at line 30 | skipping to change at line 30 | |||
if version_info != _mysql.version_info: | if version_info != _mysql.version_info: | |||
raise ImportError("this is MySQLdb version %s, but _mysql is version %r " % | raise ImportError("this is MySQLdb version %s, but _mysql is version %r " % | |||
(version_info, _mysql.version_info)) | (version_info, _mysql.version_info)) | |||
threadsafety = 1 | threadsafety = 1 | |||
apilevel = "2.0" | apilevel = "2.0" | |||
paramstyle = "format" | paramstyle = "format" | |||
from _mysql import * | from _mysql import * | |||
from MySQLdb.compat import PY2 | ||||
from MySQLdb.constants import FIELD_TYPE | from MySQLdb.constants import FIELD_TYPE | |||
from MySQLdb.times import Date, Time, Timestamp, \ | from MySQLdb.times import Date, Time, Timestamp, \ | |||
DateFromTicks, TimeFromTicks, TimestampFromTicks | DateFromTicks, TimeFromTicks, TimestampFromTicks | |||
try: | try: | |||
frozenset | frozenset | |||
except NameError: | except NameError: | |||
from sets import ImmutableSet as frozenset | from sets import ImmutableSet as frozenset | |||
class DBAPISet(frozenset): | class DBAPISet(frozenset): | |||
skipping to change at line 74 | skipping to change at line 75 | |||
def test_DBAPISet_set_inequality(): | def test_DBAPISet_set_inequality(): | |||
assert STRING != NUMBER | assert STRING != NUMBER | |||
def test_DBAPISet_set_equality_membership(): | def test_DBAPISet_set_equality_membership(): | |||
assert FIELD_TYPE.VAR_STRING == STRING | assert FIELD_TYPE.VAR_STRING == STRING | |||
def test_DBAPISet_set_inequality_membership(): | def test_DBAPISet_set_inequality_membership(): | |||
assert FIELD_TYPE.DATE != STRING | assert FIELD_TYPE.DATE != STRING | |||
def Binary(x): | if PY2: | |||
return bytes(x) | def Binary(x): | |||
return bytearray(x) | ||||
else: | ||||
def Binary(x): | ||||
return bytes(x) | ||||
def Connect(*args, **kwargs): | def Connect(*args, **kwargs): | |||
"""Factory function for connections.Connection.""" | """Factory function for connections.Connection.""" | |||
from MySQLdb.connections import Connection | from MySQLdb.connections import Connection | |||
return Connection(*args, **kwargs) | return Connection(*args, **kwargs) | |||
connect = Connection = Connect | connect = Connection = Connect | |||
__all__ = [ 'BINARY', 'Binary', 'Connect', 'Connection', 'DATE', | __all__ = [ 'BINARY', 'Binary', 'Connect', 'Connection', 'DATE', | |||
'Date', 'Time', 'Timestamp', 'DateFromTicks', 'TimeFromTicks', | 'Date', 'Time', 'Timestamp', 'DateFromTicks', 'TimeFromTicks', | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 7 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ |