Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.

Commit e8f2408

Browse files
committed
[FIX] changes for flake8 compliance
1 parent b195e38 commit e8f2408

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

influxdb/line_protocol.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@
99
from datetime import datetime
1010
from numbers import Integral
1111

12-
from pytz import UTC
13-
from dateutil.parser import parse
1412
from six import iteritems, binary_type, text_type, integer_types, PY2
1513

16-
import pandas as pd # Provide for ns timestamps
14+
import pandas as pd # Provide for ns timestamps
1715

1816
EPOCH = pd.Timestamp(0, tz='UTC')
1917

@@ -25,15 +23,15 @@ def _convert_timestamp(timestamp, precision=None):
2523
if isinstance(_get_unicode(timestamp), text_type):
2624
timestamp = pd.Timestamp(timestamp)
2725

28-
if isinstance(timestamp, datetime): # change to pandas.Timestamp
26+
if isinstance(timestamp, datetime): # change to pandas.Timestamp
2927
if not timestamp.tzinfo:
3028
timestamp = pd.Timestamp(timestamp, tz='UTC')
3129
else:
3230
timestamp = pd.Timestamp(timestamp)
3331

3432
if isinstance(timestamp, pd._libs.tslib.Timestamp):
35-
if not timestamp.tzinfo: # set to UTC for time since EPOCH
36-
timestamp = pd.Timestamp(timestamp, tz = 'UTC')
33+
if not timestamp.tzinfo: # set to UTC for time since EPOCH
34+
timestamp = pd.Timestamp(timestamp, tz='UTC')
3735
else:
3836
timestamp = timestamp.astimezone('UTC')
3937

influxdb/tests/test_line_protocol.py

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from influxdb import line_protocol
1414
import pandas as pd
1515

16+
1617
class TestLineProtocol(unittest.TestCase):
1718
"""Define the LineProtocol test object."""
1819

@@ -55,43 +56,44 @@ def test_timezone(self):
5556
eastern = berlin.astimezone(timezone('US/Eastern'))
5657
# pandas ns timestamp tests
5758
pddt = pd.Timestamp('2009-11-10 23:00:00.123456789')
58-
pdutc = pd.Timestamp(pddt, tz = 'UTC')
59+
pdutc = pd.Timestamp(pddt, tz='UTC')
5960
pdberlin = pdutc.astimezone('Europe/Berlin')
6061
pdeastern = pdberlin.astimezone('US/Eastern')
6162

62-
data = { "points": [
63-
{"measurement": "A", "fields": {"val": 1},
64-
"time": 0},
65-
#string representations
66-
{"measurement": "A", "fields": {"val": 1},
67-
"time": "2009-11-10T23:00:00.123456Z"}, # String version for datetime
68-
{"measurement": "A", "fields": {"val": 1},
69-
"time": "2009-11-10 23:00:00.123456789"}, # String version for pandas ns timestamp
70-
# datetime
71-
{"measurement": "A", "fields": {"val": 1}, "time": dt},
72-
{"measurement": "A", "fields": {"val": 1}, "time": utc},
73-
{"measurement": "A", "fields": {"val": 1}, "time": berlin},
74-
{"measurement": "A", "fields": {"val": 1}, "time": eastern},
75-
# pandas timestamp
76-
{"measurement": "A", "fields": {"val": 1}, "time": pddt},
77-
{"measurement": "A", "fields": {"val": 1}, "time": pdutc},
78-
{"measurement": "A", "fields": {"val": 1}, "time": pdberlin},
79-
{"measurement": "A", "fields": {"val": 1}, "time": pdeastern},
80-
]}
81-
63+
data = {"points": [
64+
{"measurement": "A", "fields": {"val": 1}, "time": 0},
65+
# string representations
66+
# String version for datetime
67+
{"measurement": "A", "fields": {"val": 1},
68+
"time": "2009-11-10T23:00:00.123456Z"},
69+
# String version for pandas ns timestamp
70+
{"measurement": "A", "fields": {"val": 1},
71+
"time": "2009-11-10 23:00:00.123456789"},
72+
# datetime
73+
{"measurement": "A", "fields": {"val": 1}, "time": dt},
74+
{"measurement": "A", "fields": {"val": 1}, "time": utc},
75+
{"measurement": "A", "fields": {"val": 1}, "time": berlin},
76+
{"measurement": "A", "fields": {"val": 1}, "time": eastern},
77+
# pandas timestamp
78+
{"measurement": "A", "fields": {"val": 1}, "time": pddt},
79+
{"measurement": "A", "fields": {"val": 1}, "time": pdutc},
80+
{"measurement": "A", "fields": {"val": 1}, "time": pdberlin},
81+
{"measurement": "A", "fields": {"val": 1}, "time": pdeastern},
82+
]
83+
}
8284

8385
self.assertEqual(
8486
line_protocol.make_lines(data),
8587
'\n'.join([
8688
'A val=1i 0',
8789
'A val=1i 1257894000123456000',
8890
'A val=1i 1257894000123456789',
89-
#datetime results
91+
# datetime results
9092
'A val=1i 1257894000123456000',
9193
'A val=1i 1257894000123456000',
9294
'A val=1i 1257890400123456000',
9395
'A val=1i 1257890400123456000',
94-
#pandas ns timestamp results
96+
# pandas ns timestamp results
9597
'A val=1i 1257894000123456789',
9698
'A val=1i 1257894000123456789',
9799
'A val=1i 1257894000123456789',

0 commit comments

Comments
 (0)