Skip to content

Commit 5228d3b

Browse files
StephenBrown2StephenBrown2
authored
Python 3 Update (#26)
* 2to3 Prints and idioms * Formatting * Importing * Syntax updating * Fix Flake8 * Update setup.py * Update Travis config
1 parent 76d1715 commit 5228d3b

10 files changed

+1030
-903
lines changed

‎.travis.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ language: python
33
cache: pip
44
matrix:
55
allow_failures:
6-
- python: 3.7
6+
- python: 2.7
77
include:
88
- python: 2.7
9-
#- python: 3.5
9+
- python: 3.5
10+
dist: xenial # required for Debian Squeeze
1011
#- python: 3.6
1112
- python: 3.7
1213
dist: xenial # required for Python >= 3.7 (travis-ci/travis-ci#9069)
@@ -17,7 +18,7 @@ before_script:
1718
# stop the build if there are Python syntax errors or undefined names
1819
- flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
1920
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
20-
- flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
21+
- flake8 . --count --ignore=E203 --exit-zero --max-complexity=10 --max-line-length=127 --statistics
2122
script:
2223
- true # add other tests here
2324
notifications:

‎dexcom_reader/constants.py

+43-22
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33

44
class Error(Exception):
5-
"""Base error for dexcom reader."""
5+
"""Base error for dexcom reader."""
66

77

88
class CrcError(Error):
9-
"""Failed to CRC properly."""
9+
"""Failed to CRC properly."""
1010

1111

12-
DEXCOM_USB_VENDOR = 0x22a3
12+
DEXCOM_USB_VENDOR = 0x22A3
1313
DEXCOM_USB_PRODUCT = 0x0047
1414

1515
BASE_TIME = datetime.datetime(2009, 1, 1)
@@ -64,31 +64,52 @@ class CrcError(Error):
6464
EGV_DISPLAY_ONLY_MASK = 32768
6565
EGV_TREND_ARROW_MASK = 15
6666

67-
BATTERY_STATES = [None, 'CHARGING', 'NOT_CHARGING', 'NTC_FAULT', 'BAD_BATTERY']
67+
BATTERY_STATES = [None, "CHARGING", "NOT_CHARGING", "NTC_FAULT", "BAD_BATTERY"]
6868

6969
RECORD_TYPES = [
70-
'MANUFACTURING_DATA', 'FIRMWARE_PARAMETER_DATA', 'PC_SOFTWARE_PARAMETER',
71-
'SENSOR_DATA', 'EGV_DATA', 'CAL_SET', 'DEVIATION', 'INSERTION_TIME',
72-
'RECEIVER_LOG_DATA', 'RECEIVER_ERROR_DATA', 'METER_DATA', 'USER_EVENT_DATA',
73-
'USER_SETTING_DATA', 'MAX_VALUE',
70+
"MANUFACTURING_DATA",
71+
"FIRMWARE_PARAMETER_DATA",
72+
"PC_SOFTWARE_PARAMETER",
73+
"SENSOR_DATA",
74+
"EGV_DATA",
75+
"CAL_SET",
76+
"DEVIATION",
77+
"INSERTION_TIME",
78+
"RECEIVER_LOG_DATA",
79+
"RECEIVER_ERROR_DATA",
80+
"METER_DATA",
81+
"USER_EVENT_DATA",
82+
"USER_SETTING_DATA",
83+
"MAX_VALUE",
7484
]
7585

76-
TREND_ARROW_VALUES = [None, 'DOUBLE_UP', 'SINGLE_UP', '45_UP', 'FLAT',
77-
'45_DOWN', 'SINGLE_DOWN', 'DOUBLE_DOWN', 'NOT_COMPUTABLE',
78-
'OUT_OF_RANGE']
86+
TREND_ARROW_VALUES = [
87+
None,
88+
"DOUBLE_UP",
89+
"SINGLE_UP",
90+
"45_UP",
91+
"FLAT",
92+
"45_DOWN",
93+
"SINGLE_DOWN",
94+
"DOUBLE_DOWN",
95+
"NOT_COMPUTABLE",
96+
"OUT_OF_RANGE",
97+
]
7998

80-
SPECIAL_GLUCOSE_VALUES = {0: None,
81-
1: 'SENSOR_NOT_ACTIVE',
82-
2: 'MINIMAL_DEVIATION',
83-
3: 'NO_ANTENNA',
84-
5: 'SENSOR_NOT_CALIBRATED',
85-
6: 'COUNTS_DEVIATION',
86-
9: 'ABSOLUTE_DEVIATION',
87-
10: 'POWER_DEVIATION',
88-
12: 'BAD_RF'}
99+
SPECIAL_GLUCOSE_VALUES = {
100+
0: None,
101+
1: "SENSOR_NOT_ACTIVE",
102+
2: "MINIMAL_DEVIATION",
103+
3: "NO_ANTENNA",
104+
5: "SENSOR_NOT_CALIBRATED",
105+
6: "COUNTS_DEVIATION",
106+
9: "ABSOLUTE_DEVIATION",
107+
10: "POWER_DEVIATION",
108+
12: "BAD_RF",
109+
}
89110

90111

91112
LANGUAGES = {
92-
0: None,
93-
1033: 'ENGLISH',
113+
0: None,
114+
1033: "ENGLISH",
94115
}

‎dexcom_reader/crc16.py

+34-32
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,39 @@
1+
# fmt: off
12
TABLE = [
2-
0, 4129, 8258, 12387, 16516, 20645, 24774, 28903, 33032, 37161, 41290,
3-
45419, 49548, 53677, 57806, 61935, 4657, 528, 12915, 8786, 21173, 17044,
4-
29431, 25302, 37689, 33560, 45947, 41818, 54205, 50076, 62463, 58334, 9314,
5-
13379, 1056, 5121, 25830, 29895, 17572, 21637, 42346, 46411, 34088, 38153,
6-
58862, 62927, 50604, 54669, 13907, 9842, 5649, 1584, 30423, 26358, 22165,
7-
18100, 46939, 42874, 38681, 34616, 63455, 59390, 55197, 51132, 18628, 22757,
8-
26758, 30887, 2112, 6241, 10242, 14371, 51660, 55789, 59790, 63919, 35144,
9-
39273, 43274, 47403, 23285, 19156, 31415, 27286, 6769, 2640, 14899, 10770,
10-
56317, 52188, 64447, 60318, 39801, 35672, 47931, 43802, 27814, 31879, 19684,
11-
23749, 11298, 15363, 3168, 7233, 60846, 64911, 52716, 56781, 44330, 48395,
12-
36200, 40265, 32407, 28342, 24277, 20212, 15891, 11826, 7761, 3696, 65439,
13-
61374, 57309, 53244, 48923, 44858, 40793, 36728, 37256, 33193, 45514, 41451,
14-
53516, 49453, 61774, 57711, 4224, 161, 12482, 8419, 20484, 16421, 28742,
15-
24679, 33721, 37784, 41979, 46042, 49981, 54044, 58239, 62302, 689, 4752,
16-
8947, 13010, 16949, 21012, 25207, 29270, 46570, 42443, 38312, 34185, 62830,
17-
58703, 54572, 50445, 13538, 9411, 5280, 1153, 29798, 25671, 21540, 17413,
18-
42971, 47098, 34713, 38840, 59231, 63358, 50973, 55100, 9939, 14066, 1681,
19-
5808, 26199, 30326, 17941, 22068, 55628, 51565, 63758, 59695, 39368, 35305,
20-
47498, 43435, 22596, 18533, 30726, 26663, 6336, 2273, 14466, 10403, 52093,
21-
56156, 60223, 64286, 35833, 39896, 43963, 48026, 19061, 23124, 27191, 31254,
22-
2801, 6864, 10931, 14994, 64814, 60687, 56684, 52557, 48554, 44427, 40424,
23-
36297, 31782, 27655, 23652, 19525, 15522, 11395, 7392, 3265, 61215, 65342,
24-
53085, 57212, 44955, 49082, 36825, 40952, 28183, 32310, 20053, 24180, 11923,
25-
16050, 3793, 7920
3+
0, 4129, 8258, 12387, 16516, 20645, 24774, 28903, 33032, 37161, 41290,
4+
45419, 49548, 53677, 57806, 61935, 4657, 528, 12915, 8786, 21173, 17044,
5+
29431, 25302, 37689, 33560, 45947, 41818, 54205, 50076, 62463, 58334, 9314,
6+
13379, 1056, 5121, 25830, 29895, 17572, 21637, 42346, 46411, 34088, 38153,
7+
58862, 62927, 50604, 54669, 13907, 9842, 5649, 1584, 30423, 26358, 22165,
8+
18100, 46939, 42874, 38681, 34616, 63455, 59390, 55197, 51132, 18628, 22757,
9+
26758, 30887, 2112, 6241, 10242, 14371, 51660, 55789, 59790, 63919, 35144,
10+
39273, 43274, 47403, 23285, 19156, 31415, 27286, 6769, 2640, 14899, 10770,
11+
56317, 52188, 64447, 60318, 39801, 35672, 47931, 43802, 27814, 31879, 19684,
12+
23749, 11298, 15363, 3168, 7233, 60846, 64911, 52716, 56781, 44330, 48395,
13+
36200, 40265, 32407, 28342, 24277, 20212, 15891, 11826, 7761, 3696, 65439,
14+
61374, 57309, 53244, 48923, 44858, 40793, 36728, 37256, 33193, 45514, 41451,
15+
53516, 49453, 61774, 57711, 4224, 161, 12482, 8419, 20484, 16421, 28742,
16+
24679, 33721, 37784, 41979, 46042, 49981, 54044, 58239, 62302, 689, 4752,
17+
8947, 13010, 16949, 21012, 25207, 29270, 46570, 42443, 38312, 34185, 62830,
18+
58703, 54572, 50445, 13538, 9411, 5280, 1153, 29798, 25671, 21540, 17413,
19+
42971, 47098, 34713, 38840, 59231, 63358, 50973, 55100, 9939, 14066, 1681,
20+
5808, 26199, 30326, 17941, 22068, 55628, 51565, 63758, 59695, 39368, 35305,
21+
47498, 43435, 22596, 18533, 30726, 26663, 6336, 2273, 14466, 10403, 52093,
22+
56156, 60223, 64286, 35833, 39896, 43963, 48026, 19061, 23124, 27191, 31254,
23+
2801, 6864, 10931, 14994, 64814, 60687, 56684, 52557, 48554, 44427, 40424,
24+
36297, 31782, 27655, 23652, 19525, 15522, 11395, 7392, 3265, 61215, 65342,
25+
53085, 57212, 44955, 49082, 36825, 40952, 28183, 32310, 20053, 24180, 11923,
26+
16050, 3793, 7920
2627
]
28+
# fmt: on
2729

2830

2931
def crc16(buf, start=None, end=None):
30-
if start is None:
31-
start = 0
32-
if end is None:
33-
end = len(buf)
34-
num = 0
35-
for i in range(start, end):
36-
num = ((num<<8)&0xff00) ^ TABLE[((num>>8)&0xff)^ord(buf[i])]
37-
return num & 0xffff
32+
if start is None:
33+
start = 0
34+
if end is None:
35+
end = len(buf)
36+
num = 0
37+
for i in range(start, end):
38+
num = ((num << 8) & 0xFF00) ^ TABLE[((num >> 8) & 0xFF) ^ ord(buf[i])]
39+
return num & 0xFFFF

0 commit comments

Comments
 (0)