Skip to content

Commit 6b4136a

Browse files
committed
get mac by third library
1 parent ce17d75 commit 6b4136a

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ pyasn1==0.4.2
88
rsa==4.0
99
stomp.py==4.1.22
1010
enum34==1.1.6
11+
getmac==0.8.2

tigeropen/quote/quote_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def __fetch_data(self, request):
7676
response = super(QuoteClient, self).execute(request)
7777
return response
7878
except Exception as e:
79-
if THREAD_LOCAL.logger:
79+
if hasattr(THREAD_LOCAL, 'logger') and THREAD_LOCAL.logger:
8080
THREAD_LOCAL.logger.error(e, exc_info=True)
8181
raise e
8282

tigeropen/tiger_open_client.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from __future__ import unicode_literals
88
import datetime
99
import uuid
10-
import sys
1110

1211
from tigeropen.common.consts import *
1312
from tigeropen.common.consts.params import *
@@ -17,9 +16,16 @@
1716
from tigeropen.common.exceptions import *
1817

1918
if not PYTHON_VERSION_3:
19+
import sys
2020
reload(sys)
2121
sys.setdefaultencoding('utf-8')
2222

23+
try:
24+
from getmac import get_mac_address
25+
except ImportError:
26+
def get_mac_address():
27+
return ':'.join(("%012x" % uuid.getnode())[i:i + 2] for i in range(0, 12, 2))
28+
2329

2430
class TigerOpenClient(object):
2531
"""
@@ -62,7 +68,7 @@ def __get_device_id():
6268
:return:
6369
"""
6470
try:
65-
return ':'.join(("%012x" % uuid.getnode())[i:i + 2] for i in range(0, 12, 2))
71+
return get_mac_address()
6672
except:
6773
return None
6874

0 commit comments

Comments
 (0)