|
1 | 1 | #!/usr/bin/python3 |
2 | 2 | # -*- coding: utf8 -*- |
3 | 3 | # Created L/19/10/2020 |
4 | | -# Updated D/01/01/2023 |
| 4 | +# Updated D/08/10/2023 |
5 | 5 | # |
6 | 6 | # Copyright 2020-2023 | Fabrice Creuzot (luigifab) <code~luigifab~fr> |
7 | 7 | # https://github.com/luigifab/python-radexreader |
|
16 | 16 | # merchantability or fitness for a particular purpose. See the |
17 | 17 | # GNU General Public License (GPL) for more details. |
18 | 18 |
|
19 | | -from datetime import datetime |
| 19 | +import datetime |
20 | 20 | from platform import python_version |
21 | 21 | import sys |
22 | 22 | import time |
23 | 23 | import usb |
24 | 24 | import serial |
25 | 25 |
|
| 26 | +try: |
| 27 | + datetime.UTC |
| 28 | +except AttributeError: |
| 29 | + datetime.UTC = None |
| 30 | + |
26 | 31 | # https://stackoverflow.com/a/62804772/2980105 |
27 | 32 | # prevent auto import for "import radexreader" when filename is "radexreader.py" |
28 | 33 | sys.path = sys.path[1:] |
|
60 | 65 | for timestamp, measure in measures.items(): |
61 | 66 | if timestamp != prev: |
62 | 67 | print('%s %s µSv/h ±%s%% (%s ≤ %s ≤ %s)' % ( |
63 | | - str(datetime.utcfromtimestamp(timestamp)), |
| 68 | + str(datetime.datetime.fromtimestamp(timestamp, datetime.UTC)), |
64 | 69 | str('{:.2f}'.format(measure['val'])).rjust(6, ' '), |
65 | 70 | str(int(measure['pct'])), |
66 | 71 | str('{:.2f}'.format(measure['min'])), |
|
97 | 102 | measures = reader.read(True) |
98 | 103 | for timestamp, measure in measures.items(): |
99 | 104 | print('%s %s µSv/h ±%s%% (%s ≤ %s ≤ %s)' % ( |
100 | | - str(datetime.utcfromtimestamp(timestamp)), |
| 105 | + str(datetime.datetime.fromtimestamp(timestamp, datetime.UTC)), |
101 | 106 | str('{:.2f}'.format(measure['val'])).rjust(6, ' '), |
102 | 107 | str(int(measure['pct'])), |
103 | 108 | str('{:.2f}'.format(measure['min'])), |
|
126 | 131 | measures = reader.read(False) |
127 | 132 | for timestamp, measure in measures.items(): |
128 | 133 | print('%s %s µSv/h ±%s%% (%s ≤ %s ≤ %s)' % ( |
129 | | - str(datetime.utcfromtimestamp(timestamp)), |
| 134 | + str(datetime.datetime.fromtimestamp(timestamp, datetime.UTC)), |
130 | 135 | str('{:.2f}'.format(measure['val'])).rjust(6, ' '), |
131 | 136 | str(int(measure['pct'])), |
132 | 137 | str('{:.2f}'.format(measure['min'])), |
|
0 commit comments