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

Do not shadow _ function. #1254

Merged
merged 2 commits into from
Oct 5, 2016
Merged

Do not shadow _ function. #1254

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0db43b2
Do not shadow _ function.
Oct 5, 2016
1624581
Merge branch 'master' into fix_get_df
bkyryliuk Oct 5, 2016
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: 1 addition & 2 deletions caravel/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import re

import functools
import json
Expand Down Expand Up @@ -826,7 +825,7 @@ def query( # sqla
# Patch only if the column clause is specific for DateTime set and
# granularity is selected.
@compiles(ColumnClause)
def _(element, compiler, **kw):
def visit_column(element, compiler, **kw):
text = compiler.visit_column(element, **kw)
try:
if element.is_literal and hasattr(element.type, 'python_type') and \
Expand Down