Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[hotfix] fixing the build #594

Merged
merged 1 commit into from
Jun 10, 2016
Merged

[hotfix] fixing the build #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions caravel/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from __future__ import unicode_literals

from datetime import datetime
import decimal
import functools
import json
import logging
Expand Down Expand Up @@ -229,6 +230,8 @@ def base_json_conv(obj):
return int(obj)
elif isinstance(obj, set):
return list(obj)
elif isinstance(obj, decimal.Decimal):
return float(obj)


def json_iso_dttm_ser(obj):
Expand Down
2 changes: 1 addition & 1 deletion caravel/viz.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def reassignments(self):

def get_url(self, **kwargs):
"""Returns the URL for the viz"""
d = self.form_data.copy()
d = self.orig_form_data.copy()
if 'json' in d:
del d['json']
if 'action' in d:
Expand Down
3 changes: 2 additions & 1 deletion tests/core_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import doctest
import json
import imp
import logging
import os
import unittest
from mock import Mock, patch
Expand Down Expand Up @@ -149,7 +150,7 @@ def test_slices(self):
(slc.slice_name, 'csv_endpoint', slc.viz.csv_endpoint),
]
for name, method, url in urls:
print("[name]/[{method}]: {url}".format(**locals()))
logging.info("[{name}]/[{method}]: {url}".format(**locals()))
self.client.get(url)

def test_dashboard(self):
Expand Down