Merge pull request #28 from fedotovaleksandr/master

Add compatibility with python 3 - relative imports, fix xrange, fix t…
This commit is contained in:
kurenai-ryu 2019-02-06 00:20:49 -04:00 committed by GitHub
commit 965b7a994d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 7 deletions

View File

@ -1,5 +1,6 @@
language: python
python:
- "2.7"
- "3.6"
# command to run tests
script: python test.py

View File

@ -5,7 +5,12 @@ import sys
import os
import unittest
import codecs
if sys.version_info[0] < 3:
from mock import patch, Mock, MagicMock
else:
from unittest.mock import patch, Mock, MagicMock
mock_socket = MagicMock(name='zk.socket')
sys.modules['zk.socket'] = mock_socket
from zk import ZK, const

View File

@ -5,11 +5,11 @@ from socket import AF_INET, SOCK_DGRAM, SOCK_STREAM, socket, timeout
from struct import pack, unpack
import codecs
from zk import const
from zk.attendance import Attendance
from zk.exception import ZKErrorConnection, ZKErrorResponse, ZKNetworkError
from zk.user import User
from zk.finger import Finger
from . import const
from .attendance import Attendance
from .exception import ZKErrorConnection, ZKErrorResponse, ZKNetworkError
from .user import User
from .finger import Finger
def safe_cast(val, to_type, default=None):
@ -302,7 +302,7 @@ class ZK(object):
def __reverse_hex(self, hex):
data = ''
for i in reversed(xrange(len(hex) / 2)):
for i in reversed(range(len(hex) / 2)):
data += hex[i * 2:(i * 2) + 2]
return data