diff --git a/pymysqlreplication/event.py b/pymysqlreplication/event.py index 4f05bd1a..7db9f3dd 100644 --- a/pymysqlreplication/event.py +++ b/pymysqlreplication/event.py @@ -3,7 +3,7 @@ import struct import datetime -from pymysql.util import byte2int, int2byte +from .util import byte2int, int2byte class BinLogEvent(object): diff --git a/pymysqlreplication/packet.py b/pymysqlreplication/packet.py index df12ddf4..7dc2e1f1 100644 --- a/pymysqlreplication/packet.py +++ b/pymysqlreplication/packet.py @@ -2,9 +2,9 @@ import struct -from pymysql.util import byte2int from pymysqlreplication import constants, event, row_event +from .util import byte2int # Constants from PyMYSQL source code NULL_COLUMN = 251 diff --git a/pymysqlreplication/row_event.py b/pymysqlreplication/row_event.py index 88a5b285..43d74484 100644 --- a/pymysqlreplication/row_event.py +++ b/pymysqlreplication/row_event.py @@ -4,8 +4,7 @@ import decimal import datetime -from pymysql.util import byte2int - +from .util import byte2int from .event import BinLogEvent from .constants import FIELD_TYPE from .constants import BINLOG diff --git a/pymysqlreplication/util.py b/pymysqlreplication/util.py new file mode 100644 index 00000000..25100521 --- /dev/null +++ b/pymysqlreplication/util.py @@ -0,0 +1,10 @@ +import struct + +def byte2int(b): + try: + return struct.unpack("!B", b)[0] + except TypeError: #With python 3 some read return int + return b + +def int2byte(i): + return struct.pack("!B", i)