Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
fredfortier
2017-12-07 20:26:45 -05:00
3 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -129,7 +129,7 @@ class PoloniexCurator(object):
start = str(newstart),
end = str(end)
)
print url
print(url)
attempts = 0
success = 0
+3 -2
View File
@@ -107,8 +107,9 @@ class Poloniex_api(object):
data=post_data,
headers=headers,
)
return json.loads(
urlopen(req, context=ssl._create_unverified_context()).read())
resource = urlopen(req, context=ssl._create_unverified_context())
content = resource.read().decode('utf-8')
return json.loads(content)
def returnticker(self):
return self.query('returnTicker', {})
+1 -1
View File
@@ -51,7 +51,7 @@ class ValidateChunks(object):
if data_frequency == 'daily':
end = end - pd.Timedelta(hours=23, minutes=59)
print start, end, data_frequency
print(start, end, data_frequency)
arrays = reader.load_raw_arrays(self.columns, start, end,
[asset.sid, ])